aboutsummaryrefslogtreecommitdiff
path: root/engines/tucker/resource.cpp
diff options
context:
space:
mode:
authorGregory Montoir2009-05-11 14:04:44 +0000
committerGregory Montoir2009-05-11 14:04:44 +0000
commit2fd66d8eae7c41d291ee7dcbc12c0e142e7a982f (patch)
tree4884ceb3093e8eca46b8acc4e7e95e980bf7e5c5 /engines/tucker/resource.cpp
parent1949133d22a3435c7a3ae4532d59967d27cf7708 (diff)
downloadscummvm-rg350-2fd66d8eae7c41d291ee7dcbc12c0e142e7a982f.tar.gz
scummvm-rg350-2fd66d8eae7c41d291ee7dcbc12c0e142e7a982f.tar.bz2
scummvm-rg350-2fd66d8eae7c41d291ee7dcbc12c0e142e7a982f.zip
some cleanup :
- separated instruction table parsing from instruction execution - added a few debug calls to monitor game flags changes - some variables/functions renaming svn-id: r40454
Diffstat (limited to 'engines/tucker/resource.cpp')
-rw-r--r--engines/tucker/resource.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index 64dc567d51..e10f824265 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -701,6 +701,7 @@ void TuckerEngine::loadActionFile() {
action->index = t.getNextInteger();
action->delay = t.getNextInteger();
action->setFlagNum = t.getNextInteger();
+ assert(action->setFlagNum >= 0 && action->setFlagNum < kFlagsTableSize);
action->setFlagValue = t.getNextInteger();
action->fxNum = t.getNextInteger();
action->fxDelay = t.getNextInteger();
@@ -1015,10 +1016,7 @@ void TuckerEngine::loadActionsTable() {
}
break;
}
- table = 0;
- while (table == 0) {
- table = parseTableInstruction();
- }
+ while ((table = executeTableInstruction()) == 0);
} while (table == 3);
if (table == 2) {
_nextAction = 0;