[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.240,1.241
Max Horn
fingolfin at users.sourceforge.net
Sun Jan 22 13:06:05 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26670
Modified Files:
script.cpp
Log Message:
Simplified SCUMM version checks in writeVar/readVar
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- script.cpp 18 Jan 2006 17:39:46 -0000 1.240
+++ script.cpp 22 Jan 2006 21:05:38 -0000 1.241
@@ -531,8 +531,7 @@
checkRange(_numRoomVariables - 1, 0, var, "Room variable %d out of range(w)");
return _roomVars[var];
- } else if ((_gameId == GID_ZAK256) || (_features & GF_OLD_BUNDLE) ||
- (_gameId == GID_LOOM && (_platform == Common::kPlatformFMTowns))) {
+ } else if (_version <= 3) {
int bit = var & 0xF;
var = (var >> 4) & 0xFF;
@@ -621,8 +620,7 @@
checkRange(_numRoomVariables - 1, 0, var, "Room variable %d out of range(w)");
_roomVars[var] = value;
- } else if ((_gameId == GID_ZAK256) || (_features & GF_OLD_BUNDLE) ||
- (_gameId == GID_LOOM && (_platform == Common::kPlatformFMTowns))) {
+ } else if (_version <= 3) {
// In the old games, the bit variables were using the same memory
// as the normal variables!
int bit = var & 0xF;
More information about the Scummvm-git-logs
mailing list