diff options
| author | Max Horn | 2003-07-22 22:33:34 +0000 |
|---|---|---|
| committer | Max Horn | 2003-07-22 22:33:34 +0000 |
| commit | b43125cd36c0c78c2ea352c683be77b96998feaf (patch) | |
| tree | c07906da8f7ff24d2e7aa45cbec89cbd7a1faa3e /scumm | |
| parent | 5c9ebd053e3dfdbabb9e1e563570b4174b28126e (diff) | |
| download | scummvm-rg350-b43125cd36c0c78c2ea352c683be77b96998feaf.tar.gz scummvm-rg350-b43125cd36c0c78c2ea352c683be77b96998feaf.tar.bz2 scummvm-rg350-b43125cd36c0c78c2ea352c683be77b96998feaf.zip | |
fix for bug #775839; unified the various Indy3 checks (this gets annoying, maybe we can merge the three GIDs after 0.5.0; any difference could be handled via _feature flags (e.g. added a GF_TOWNS flag)
svn-id: r9137
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v5.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index bdff5aa004..cca3d1ab86 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -599,7 +599,8 @@ void Scumm_v5::o5_chainScript() { // the actor ID of the opposing soldier. So, we copy that value // over to the Local[5] variable of script 33. // See also bug #743314. - if ((_gameId == GID_INDY3_256 || _gameId == GID_INDY3_TOWNS) && vm.slot[cur].number == 32 && script == 33) { + if ((_gameId == GID_INDY3_TOWNS || _gameId == GID_INDY3_256 || _gameId == GID_INDY3) + && vm.slot[cur].number == 32 && script == 33) { vars[5] = vm.localvar[cur][5]; } @@ -975,7 +976,7 @@ void Scumm_v5::o5_getActorScale() { return; // INDY3 uses this opcode as a wait_for_actor(); - if ((_gameId == GID_INDY3_TOWNS) || (_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) { + if (_gameId == GID_INDY3_TOWNS || _gameId == GID_INDY3_256 || _gameId == GID_INDY3) { const byte *oldaddr = _scriptPointer - 1; a = derefActor(getVarOrDirectByte(0x80), "o5_getActorScale (wait)"); if (a->moving) { @@ -2341,7 +2342,7 @@ void Scumm_v5::o5_verbOps() { void Scumm_v5::o5_wait() { const byte *oldaddr = _scriptPointer - 1; - if ((_gameId == GID_INDY3_TOWNS) || (_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) { + if (_gameId == GID_INDY3_TOWNS || _gameId == GID_INDY3_256 || _gameId == GID_INDY3) { _opcode = 2; } else _opcode = fetchScriptByte(); |