[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.100,1.101 scummvm.cpp,1.144,1.145

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv13679

Modified Files:
	script_v1.cpp scummvm.cpp 
Log Message:
Fix next to last Zak bugs.

Zak256 is now completable apart from getting stuck in the shop (walkbox issue)




Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- script_v1.cpp	8 May 2002 06:57:27 -0000	1.100
+++ script_v1.cpp	8 May 2002 09:09:39 -0000	1.101
@@ -900,9 +900,6 @@
 
 	cur = _currentScript;
 
-	if (vm.slot[cur].cutsceneOverride != 0)
-		error("Script %d chaining with active cutscene/override");
-
 	vm.slot[cur].number = 0;
 	vm.slot[cur].status = 0;
 	_currentScript = 0xFF;
@@ -1012,6 +1009,7 @@
 	delay |= fetchScriptByte() << 16;
 	vm.slot[_currentScript].delay = delay;
 	vm.slot[_currentScript].status = 1;
+	
 	o5_breakHere();
 }
 
@@ -1398,6 +1396,8 @@
 			&& r < 60)
 		r = 60;
 
+	if (r > 0)	// FIXME: Fixes several off-by-one errors (eg,					
+		r--;	//		  zak's tv). Find real cause of bug. 
 	setResult(r);
 }
 
@@ -1606,13 +1606,6 @@
 {
 	int room;
 
-	/* Begin: Autosave 
-	   _saveLoadSlot = 0;
-	   sprintf(_saveLoadName, "Autosave", _saveLoadSlot);
-	   _saveLoadFlag = 1;
-	   _saveLoadCompatible = false;
-	   End: Autosave */
-
 	room = getVarOrDirectByte(0x80);
 	startScene(room, 0, 0);
 	_fullRedraw = 1;
@@ -1622,13 +1615,6 @@
 {
 	int obj, room, x, y;
 	Actor *a;
-
-	/* Begin: Autosave 
-	   _saveLoadSlot = 0;
-	   sprintf(_saveLoadName, "Autosave", _saveLoadSlot);
-	   _saveLoadFlag = 1;
-	   _saveLoadCompatible = false;
-	   End: Autosave */
 
 	obj = getVarOrDirectWord(0x80);
 	room = getVarOrDirectByte(0x40);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- scummvm.cpp	8 May 2002 00:27:09 -0000	1.144
+++ scummvm.cpp	8 May 2002 09:09:39 -0000	1.145
@@ -1287,6 +1287,8 @@
 			delta = 5;
 		} else {
 			delta = scummLoop(delta);
+			if (delta < 1)	// Ensure we don't get into a loop
+				delta = 1;  // by not decreasing sleepers.
 		}
 	}
 }