diff options
| author | Max Horn | 2005-04-20 18:21:30 +0000 |
|---|---|---|
| committer | Max Horn | 2005-04-20 18:21:30 +0000 |
| commit | c46ea8bc407e60224500e6d6efa08d2ddd6f318e (patch) | |
| tree | 4800c3beb69f0bfe6d1c6f456e8f5ea58780b6f6 /scumm/script.cpp | |
| parent | a18d4d5c2f6dbc985c5b3628228bb6078cf781bb (diff) | |
| download | scummvm-rg350-c46ea8bc407e60224500e6d6efa08d2ddd6f318e.tar.gz scummvm-rg350-c46ea8bc407e60224500e6d6efa08d2ddd6f318e.tar.bz2 scummvm-rg350-c46ea8bc407e60224500e6d6efa08d2ddd6f318e.zip | |
Replaced the platform specific GF_FOO switches (using _platform instead now)
svn-id: r17716
Diffstat (limited to 'scumm/script.cpp')
| -rw-r--r-- | scumm/script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index ff97f325ca..8f631dee6f 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -524,12 +524,12 @@ int ScummEngine::readVar(uint var) { return _roomVars[var]; } else if ((_gameId == GID_ZAK256) || (_features & GF_OLD_BUNDLE) || - (_gameId == GID_LOOM && (_features & GF_FMTOWNS))) { + (_gameId == GID_LOOM && (_platform == Common::kPlatformFMTowns))) { int bit = var & 0xF; var = (var >> 4) & 0xFF; if (!_copyProtection) { - if (_gameId == GID_LOOM && (_features & GF_FMTOWNS) && var == 214 && bit == 15) { + if (_gameId == GID_LOOM && (_platform == Common::kPlatformFMTowns) && var == 214 && bit == 15) { return 0; } else if (_gameId == GID_ZAK256 && var == 151 && bit == 8) { return 0; @@ -541,7 +541,7 @@ int ScummEngine::readVar(uint var) { } else { var &= 0x7FFF; if (!_copyProtection) { - if (_gameId == GID_INDY3 && (_features & GF_FMTOWNS) && var == 1508) + if (_gameId == GID_INDY3 && (_platform == Common::kPlatformFMTowns) && var == 1508) return 0; } @@ -607,7 +607,7 @@ void ScummEngine::writeVar(uint var, int value) { _roomVars[var] = value; } else if ((_gameId == GID_ZAK256) || (_features & GF_OLD_BUNDLE) || - (_gameId == GID_LOOM && (_features & GF_FMTOWNS))) { + (_gameId == GID_LOOM && (_platform == Common::kPlatformFMTowns))) { // In the old games, the bit variables were using the same memory // as the normal variables! int bit = var & 0xF; |