thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more v2 fixes; cleanup

Browse source 
svn-id: r7301
This commit is contained in:
Max Horn 2003-05-04 02:10:49 +00:00
parent 3b77249ab0
commit 488d5fe351
4 changed files with 47 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scumm/script.cpp
View file

@ -371,11 +371,7 @@ int Scumm::readVar(uint var) {
checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)");
if ((_features & GF_AFTER_V2) && (var >= 14) && (var <= 16)) {
return _vars[_vars[var]];
} else {
return _vars[var];
}
return _vars[var];
}
if (var & 0x2000 && !(_features & GF_NEW_OPCODES)) {
@ -387,9 +383,6 @@ int Scumm::readVar(uint var) {
var &= ~0x2000;
}
if (!(var & 0xF000))
return _vars[var];
if (var & 0x8000) {
if ((_gameId == GID_ZAK256) || (_features & GF_OLD_BUNDLE)) {
// Emulate a wierd hack in Zak256 to read individual