[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.298,1.299
kirben
kirben at users.sourceforge.net
Tue Oct 11 22:59:13 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7538/scumm
Modified Files:
script_v5.cpp
Log Message:
Revert last change and add a safe work around for bug.
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -d -r1.298 -r1.299
--- script_v5.cpp 12 Oct 2005 05:46:56 -0000 1.298
+++ script_v5.cpp 12 Oct 2005 05:58:57 -0000 1.299
@@ -1820,9 +1820,7 @@
break;
default:
- // FIXME: Reverted to a warning from an error, as per
- // zak256 bug #1290485. This is not a proper fix. :)
- warning("o5_resourceRoutines: default case %d", op);
+ error("o5_resourceRoutines: default case %d", op);
}
}
@@ -2265,6 +2263,11 @@
getWordVararg(data);
+ // FIXME: Script 171 loads a complete room resource, instead of the actual script.
+ // Causing invalid opcode cases, see bug #1290485
+ if (_gameId == GID_ZAK256 && script == 171)
+ return;
+
if (!_copyProtection) {
// Method used by original games to skip copy protection scheme
if (_gameId == GID_LOOM && _currentRoom == 69 && script == 201)
More information about the Scummvm-git-logs
mailing list