aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2014-04-04 20:57:09 -0400
committerPaul Gilbert2014-04-04 20:57:09 -0400
commitb778217d8eea64d385947a96a94cdea7c686c605 (patch)
tree30bf0c1f0fc744de8ce8b02dc03431853c414a0e
parent4639d37609f62bae8d0bcffc5a2e64c79f2659a7 (diff)
downloadscummvm-rg350-b778217d8eea64d385947a96a94cdea7c686c605.tar.gz
scummvm-rg350-b778217d8eea64d385947a96a94cdea7c686c605.tar.bz2
scummvm-rg350-b778217d8eea64d385947a96a94cdea7c686c605.zip
MADS: Fix for actions get repeated endlessly
-rw-r--r--engines/mads/scene.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index a71eade786..64260a69dc 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -455,8 +455,7 @@ void Scene::doAction() {
_vm->_game->_triggerSetupMode = KERNEL_TRIGGER_PARSER;
if ((_action._inProgress || _vm->_game->_trigger) && !_action._savedFields._commandError) {
_sceneLogic->actions();
- _action._inProgress = true;
- flag = true;
+ flag = !_action._inProgress;
}
if (_vm->_game->_screenObjects._inputMode == kInputConversation) {
@@ -465,8 +464,7 @@ void Scene::doAction() {
if ((_action._inProgress || _vm->_game->_trigger) ||
(!flag && _action._savedFields._commandError == flag)) {
_vm->_game->_sectionHandler->sectionPtr2();
- _action._inProgress = true;
- flag = true;
+ flag = !_action._inProgress;
}
if ((_action._inProgress || _vm->_game->_trigger) &&