aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTravis Howell2006-10-25 10:21:57 +0000
committerTravis Howell2006-10-25 10:21:57 +0000
commit588c3e0bf1412b883dd79a2ca928234b315bf1a0 (patch)
treeb861b1c2f0671abd7b6533ef6ff3f5e359d1f36f /engines
parent15915e805d799d5e3039ac0065a03d9ec010a941 (diff)
downloadscummvm-rg350-588c3e0bf1412b883dd79a2ca928234b315bf1a0.tar.gz
scummvm-rg350-588c3e0bf1412b883dd79a2ca928234b315bf1a0.tar.bz2
scummvm-rg350-588c3e0bf1412b883dd79a2ca928234b315bf1a0.zip
Revert debug changes
svn-id: r24496
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/subroutine.cpp19
1 files changed, 6 insertions, 13 deletions
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp
index 0c76144370..6975017664 100644
--- a/engines/agos/subroutine.cpp
+++ b/engines/agos/subroutine.cpp
@@ -215,8 +215,8 @@ Subroutine *AGOSEngine::getSubroutineByID(uint subroutine_id) {
}
}
- //if (subroutine_id != 160)
- // debug(0,"getSubroutineByID: subroutine %d not found", subroutine_id);
+ if (subroutine_id != 160)
+ debug(0,"getSubroutineByID: subroutine %d not found", subroutine_id);
return NULL;
}
@@ -312,7 +312,6 @@ bool AGOSEngine::loadTablesOldIntoMem(uint subr_id) {
p += 6;
while (min_num) {
- //printf("loadTablesOldIntoMem: min %d max %d\n", min_num, max_num);
if ((subr_id >= min_num) && (subr_id <= max_num)) {
_subroutineList = _subroutineListOrg;
_tablesHeapPtr = _tablesHeapPtrOrg;
@@ -369,7 +368,6 @@ bool AGOSEngine::loadTablesNewIntoMem(uint subr_id) {
max_num = READ_BE_UINT16(p); p += 2;
- //printf("loadTablesNewIntoMem: min %d max %d\n", min_num, max_num);
if (subr_id >= min_num && subr_id <= max_num) {
_subroutineList = _subroutineListOrg;
_tablesHeapPtr = _tablesHeapPtrOrg;
@@ -515,12 +513,9 @@ SubroutineLine *AGOSEngine::createSubroutineLine(Subroutine *sub, int where) {
void AGOSEngine::runSubroutine101() {
Subroutine *sub;
- for (int i = 0; i < 1000000; i++) {
- sub = getSubroutineByID(i);
- if (sub != NULL)
- startSubroutine(sub);
- }
- error("Complete");
+ sub = getSubroutineByID(101);
+ if (sub != NULL)
+ startSubroutineEx(sub);
permitInput();
}
@@ -542,11 +537,9 @@ int AGOSEngine::startSubroutine(Subroutine *sub) {
_classMode1 = 0;
_classMode2 = 0;
- //if (_startMainScript)
+ if (_startMainScript)
dumpSubroutine(sub);
- return 0;
-
if (++_recursionDepth > 40)
error("Recursion error");