[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.69,1.69.2.1

[Max Horn]

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

Modified Files:
      Tag: branch-0-4-0
	script_v5.cpp 
Log Message:
fixed bug #734057

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.69
retrieving revision 1.69.2.1
diff -u -d -r1.69 -r1.69.2.1
--- script_v5.cpp	5 May 2003 09:25:07 -0000	1.69
+++ script_v5.cpp	7 May 2003 23:08:56 -0000	1.69.2.1
@@ -1524,16 +1524,17 @@
 	_opcode = fetchScriptByte();
 	if (_opcode != 17)
 		resid = getVarOrDirectByte(0x80);
+	int op = _opcode;
 	if (_gameId == GID_ZAK256)
-		_opcode &= 0x3F;
+		op &= 0x3F;
 	else
-		_opcode &= 0x1F;
+		op &= 0x1F;
 
-	switch (_opcode) {
+	switch (op) {
 	case 1:											// load script
 	case 2:											// load sound
 	case 3:											// load costume
-		ensureResourceLoaded(resType[_opcode-1], resid);
+		ensureResourceLoaded(resType[op-1], resid);
 		break;
 	case 4:											// load room 
 		if (_features == GF_AFTER_V3) {
@@ -1553,9 +1554,9 @@
 	case 7:											// nuke costume
 	case 8:											// nuke room
 		if (_gameId == GID_ZAK256)
-			warning("o5_resourceRoutines %d should not occur in Zak256", _opcode);
+			warning("o5_resourceRoutines %d should not occur in Zak256", op);
 		else
-			setResourceCounter(resType[_opcode-5], resid, 0x7F);
+			setResourceCounter(resType[op-5], resid, 0x7F);
 		break;
 
 	case 9:											// lock script