[Scummvm-cvs-logs] SF.net SVN: scummvm: [24496] scummvm/trunk/engines/agos/subroutine.cpp

[kirben at users.sourceforge.net]

Revision: 24496
          http://svn.sourceforge.net/scummvm/?rev=24496&view=rev
Author:   kirben
Date:     2006-10-25 03:21:57 -0700 (Wed, 25 Oct 2006)

Log Message:
-----------
Revert debug changes

Modified Paths:
--------------
    scummvm/trunk/engines/agos/subroutine.cpp

Modified: scummvm/trunk/engines/agos/subroutine.cpp
===================================================================
--- scummvm/trunk/engines/agos/subroutine.cpp	2006-10-25 10:20:17 UTC (rev 24495)
+++ scummvm/trunk/engines/agos/subroutine.cpp	2006-10-25 10:21:57 UTC (rev 24496)
@@ -215,8 +215,8 @@
 		}
 	}
 
-	//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 @@
 	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 @@
 
 			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 @@
 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 @@
 	_classMode1 = 0;
 	_classMode2 = 0;
 
-	//if (_startMainScript)
+	if (_startMainScript)
 		dumpSubroutine(sub);
 
-	return 0;
-
 	if (++_recursionDepth > 40)
 		error("Recursion error");
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.