[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.53,1.54 script_v5.cpp,1.34,1.35

[Pawel Kolodziejski]

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

Modified Files:
	script.cpp script_v5.cpp 
Log Message:
some changes for indy ega

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- script.cpp	13 Apr 2003 16:42:33 -0000	1.53
+++ script.cpp	18 Apr 2003 21:10:32 -0000	1.54
@@ -355,7 +355,7 @@
 		return _vars[var];
 
 	if (var & 0x8000) {
-		if ((_gameId == GID_ZAK256) || (_gameId == GID_LOOM)) {
+		if ((_gameId == GID_ZAK256) || (_features & GF_OLD_BUNDLE)) {
 			// Emulate a wierd hack in Zak256 to read individual
 			// bits of a normal global
 			int b = (var & 0x000F);
@@ -405,7 +405,7 @@
 	}
 
 	if (var & 0x8000) {
-		if ((_gameId == GID_ZAK256) || (_gameId == GID_LOOM)) {
+		if ((_gameId == GID_ZAK256) || (_features & GF_OLD_BUNDLE)) {
 			// Emulate a wierd hack in Zak256 to read individual
 			// bits of a normal global
 			int b = (var & 0x000F);

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- script_v5.cpp	18 Apr 2003 20:47:19 -0000	1.34
+++ script_v5.cpp	18 Apr 2003 21:10:32 -0000	1.35
@@ -954,7 +954,7 @@
 		return;
 
 	// INDY3 uses this opcode as a wait_for_actor();
-	if ((_gameId == GID_INDY3_256) || (_features & GF_OLD_BUNDLE)) {
+	if ((_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) {
 		byte *oldaddr = _scriptPointer - 1;
 		if (derefActorSafe(getVarOrDirectByte(0x80), "o5_wait")->moving) {
 			_scriptPointer = oldaddr;
@@ -986,7 +986,7 @@
 	int a;
 	getResultPos();
 
-	if (_gameId == GID_INDY3_256)
+	if ((_gameId == GID_INDY3_256) || (_gameId == GID_INDY3))
 		a = getVarOrDirectByte(0x80);
 	else
 		a = getVarOrDirectWord(0x80);
@@ -998,7 +998,9 @@
 	int a;
 	getResultPos();
 
-	if (_gameId == GID_INDY3_256) {
+	if (_gameId == GID_INDY3)
+		a = getVarOrDirectByte(0x80);
+	else if (_gameId == GID_INDY3_256) {
 		a = getVarOrDirectByte(0x80);
 
 		// Indy3 hack to cheat the 'Leap of Faith' grail test