diff options
| author | Max Horn | 2002-12-01 12:55:48 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-01 12:55:48 +0000 |
| commit | 37c0b1be55aa63fc2fb56244a106736f52ccef3b (patch) | |
| tree | 59106308f810de8d7a1a4e649fd7283cf1326d22 | |
| parent | 7098159101a7be094586dbe7383d7ecb1a2f53cf (diff) | |
| download | scummvm-rg350-37c0b1be55aa63fc2fb56244a106736f52ccef3b.tar.gz scummvm-rg350-37c0b1be55aa63fc2fb56244a106736f52ccef3b.tar.bz2 scummvm-rg350-37c0b1be55aa63fc2fb56244a106736f52ccef3b.zip | |
restrict various o5_resourceRoutines modifications to Zak256
svn-id: r5771
| -rw-r--r-- | scumm/script_v1.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/script_v1.cpp b/scumm/script_v1.cpp index d39f963121..85a6c3bafe 100644 --- a/scumm/script_v1.cpp +++ b/scumm/script_v1.cpp @@ -1507,7 +1507,7 @@ void Scumm::o5_resourceRoutines() _opcode = fetchScriptByte(); if (_opcode != 17) resid = getVarOrDirectByte(0x80); - if (_features & GF_OLD256) + if (_gameId == GID_ZAK256) _opcode &= 0x3F; else _opcode &= 0x1F; @@ -1519,7 +1519,7 @@ void Scumm::o5_resourceRoutines() ensureResourceLoaded(resType[_opcode-1], resid); break; case 4: // load room - if (_features & GF_OLD256) { + if (_gameId == GID_ZAK256) { ensureResourceLoaded(rtRoom, resid); if (resid > 0x7F) resid = _resourceMapper[resid & 0x7F]; @@ -1535,8 +1535,8 @@ void Scumm::o5_resourceRoutines() case 6: // nuke sound case 7: // nuke costume case 8: // nuke room - if (_features & GF_OLD256) - warning("o5_resourceRoutines %d should not occure in GF_OLD256 games", _opcode); + if (_gameId == GID_ZAK256) + warning("o5_resourceRoutines %d should not occur in Zak256", _opcode); else setResourceCounter(resType[_opcode-5], resid, 0x7F); break; |