[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.175,1.176

Max Horn fingolfin at users.sourceforge.net
Mon Sep 8 22:20:24 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv22651

Modified Files:
	script_v5.cpp 
Log Message:
WORKAROUND bug #770065: Sync issue in lens conversation (this is actually a script bug)

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- script_v5.cpp	8 Sep 2003 03:06:37 -0000	1.175
+++ script_v5.cpp	8 Sep 2003 13:28:56 -0000	1.176
@@ -549,6 +549,36 @@
 	int a;
 	getResultPos();
 	a = getVarOrDirectWord(0x80);
+
+	// WORKAROUND bug #770065: This works around a script bug in LoomCD. To
+	// understand the reasoning behind this, compare script 210 and 218 in
+	// room 20. Apparently they made a mistake when converting the absolute
+	// delays into relative ones.
+	if (_gameId == GID_LOOM256 && vm.slot[_currentScript].number == 210 && _currentRoom == 20 && _resultVarNumber == 0x4000) {
+		switch (a) {
+		// Fix for the Var[250] == 11 case
+		case 138:
+			a = 145;
+			break;
+		case 324:
+			a = 324 - 138;
+			break;
+		// Fixes for the Var[250] == 14 case
+		case 130:
+			a = 170;
+			break;
+		case 342:
+			a = 342 - 130 + 15;	// Small extra adjustment for the "OUCH"
+			break;
+		case 384:
+			a -= 342;
+			break;
+		case 564:
+			a -= 384;
+			break;
+		}
+	}
+
 	setResult(readVar(_resultVarNumber) + a);
 }
 
@@ -583,7 +613,7 @@
 	cur = _currentScript;
 
 	// WORKAROUND bug #743314: Work around a bug in script 33 in Indy3 VGA.
-	// That script is used for the fist fights in the Zeppeling. It uses
+	// That script is used for the fist fights in the Zeppelin. It uses
 	// Local[5], even though that is never set to any value. But script 33 is
 	// called via chainScript by script 32, and in there Local[5] is defined
 	// to the  actor ID of the opposing soldier. So, we copy that value over





More information about the Scummvm-git-logs mailing list