[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.44,1.45

Max Horn fingolfin at users.sourceforge.net
Sun Apr 27 08:59:05 CEST 2003


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

Modified Files:
	script_v5.cpp 
Log Message:
this indy3 hack is needed for the ega version, too; restricted zeppelin hack to the room where it is needed (this might fix the levitating guard bug)

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- script_v5.cpp	27 Apr 2003 11:01:42 -0000	1.44
+++ script_v5.cpp	27 Apr 2003 15:58:36 -0000	1.45
@@ -986,7 +986,7 @@
 	int a;
 	getResultPos();
 
-	if ((_gameId == GID_INDY3_256) || (_gameId == GID_INDY3))
+	if (_gameId == GID_INDY3_256 || _gameId == GID_INDY3)
 		a = getVarOrDirectByte(0x80);
 	else
 		a = getVarOrDirectWord(0x80);
@@ -998,9 +998,7 @@
 	int a;
 	getResultPos();
 
-	if (_gameId == GID_INDY3)
-		a = getVarOrDirectByte(0x80);
-	else if (_gameId == GID_INDY3_256) {
+	if (_gameId == GID_INDY3_256 || _gameId == GID_INDY3) {
 		a = getVarOrDirectByte(0x80);
 
 		// Indy3 hack to cheat the 'Leap of Faith' grail test
@@ -1009,10 +1007,12 @@
 			setResult(94);
 			return;
 		}
-		setResult(getObjY(a) - 1);	// FIXME: Is this right, or can it be less specific?
-						// It's here to fix bug 636433 in specific, the actors
-						// are one pixel off what the script waits for.
-		return;
+
+		// Hack to fix bug 636433 (can't get into Zeppelin) 
+		if (_roomResource == 36) {
+			setResult(getObjY(a) - 1);
+			return;
+		}
 	} else
 		a = getVarOrDirectWord(0x80);
 





More information about the Scummvm-git-logs mailing list