diff options
author | Max Horn | 2003-05-04 02:10:49 +0000 |
---|---|---|
committer | Max Horn | 2003-05-04 02:10:49 +0000 |
commit | 488d5fe351d4546023770cfee3e2bd76973614c7 (patch) | |
tree | e6cd22e539cdb87ddb5f5a8aa210cbad064d0034 /scumm/script.cpp | |
parent | 3b77249ab073515832eb8b2d628ba71d9fd1655c (diff) | |
download | scummvm-rg350-488d5fe351d4546023770cfee3e2bd76973614c7.tar.gz scummvm-rg350-488d5fe351d4546023770cfee3e2bd76973614c7.tar.bz2 scummvm-rg350-488d5fe351d4546023770cfee3e2bd76973614c7.zip |
more v2 fixes; cleanup
svn-id: r7301
Diffstat (limited to 'scumm/script.cpp')
-rw-r--r-- | scumm/script.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 70fa45bd8c..181aad737a 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -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 |