[Scummvm-cvs-logs] CVS: scummvm/scumm script_v1.cpp,1.33,1.34

Max Horn fingolfin at users.sourceforge.net
Sun Dec 1 04:56:02 CET 2002


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

Modified Files:
	script_v1.cpp 
Log Message:
restrict various o5_resourceRoutines modifications to Zak256

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v1.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- script_v1.cpp	29 Nov 2002 18:27:35 -0000	1.33
+++ script_v1.cpp	1 Dec 2002 12:55:48 -0000	1.34
@@ -1507,7 +1507,7 @@
 	_opcode = fetchScriptByte();
 	if (_opcode != 17)
 		resid = getVarOrDirectByte(0x80);
-	if (_features & GF_OLD256)
+	if (_gameId == GID_ZAK256)
 		_opcode &= 0x3F;
 	else
 		_opcode &= 0x1F;
@@ -1519,7 +1519,7 @@
 		ensureResourceLoaded(resType[_opcode-1], resid);
 		break;
 	case 4:											// load room 
-		if (_features & GF_OLD256) {
+		if (_gameId == GID_ZAK256) {
 			ensureResourceLoaded(rtRoom, resid);
 			if (resid > 0x7F)
 				resid = _resourceMapper[resid & 0x7F];
@@ -1535,8 +1535,8 @@
 	case 6:											// nuke sound
 	case 7:											// nuke costume
 	case 8:											// nuke room
-		if (_features & GF_OLD256)
-			warning("o5_resourceRoutines %d should not occure in GF_OLD256 games", _opcode);
+		if (_gameId == GID_ZAK256)
+			warning("o5_resourceRoutines %d should not occur in Zak256", _opcode);
 		else
 			setResourceCounter(resType[_opcode-5], resid, 0x7F);
 		break;





More information about the Scummvm-git-logs mailing list