aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/exec_ns.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2007-11-18 13:22:38 +0000
committerNicola Mettifogo2007-11-18 13:22:38 +0000
commit6471eb84f25d156a98bcf0447862e4839f8cc24d (patch)
tree19d23a9a923a5733db332957a1019b6b65299618 /engines/parallaction/exec_ns.cpp
parentade0b5a21222c705a8fe3a3e67d6c783904c6d5e (diff)
downloadscummvm-rg350-6471eb84f25d156a98bcf0447862e4839f8cc24d.tar.gz
scummvm-rg350-6471eb84f25d156a98bcf0447862e4839f8cc24d.tar.bz2
scummvm-rg350-6471eb84f25d156a98bcf0447862e4839f8cc24d.zip
Cleanup.
svn-id: r29556
Diffstat (limited to 'engines/parallaction/exec_ns.cpp')
-rw-r--r--engines/parallaction/exec_ns.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp
index 034c7650f3..253025a461 100644
--- a/engines/parallaction/exec_ns.cpp
+++ b/engines/parallaction/exec_ns.cpp
@@ -241,9 +241,7 @@ DECLARE_COMMAND_OPCODE(speak) {
DECLARE_COMMAND_OPCODE(get) {
_cmdRunCtxt.cmd->u._zone->_flags &= ~kFlagsFixed;
- if (!runZone(_cmdRunCtxt.cmd->u._zone)) {
- runCommands(_cmdRunCtxt.cmd->u._zone->_commands);
- }
+ runZone(_cmdRunCtxt.cmd->u._zone);
}
@@ -443,6 +441,9 @@ label1:
void Parallaction::runCommands(CommandList& list, Zone *z) {
+ if (list.size() == 0)
+ return;
+
debugC(3, kDebugExec, "runCommands");
CommandList::iterator it = list.begin();
@@ -598,6 +599,8 @@ uint16 Parallaction::runZone(Zone *z) {
debugC(3, kDebugExec, "runZone completed");
+ runCommands(z->_commands, z);
+
return 0;
}