diff options
| author | Paweł Kołodziejski | 2003-04-13 20:15:44 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-04-13 20:15:44 +0000 |
| commit | 158a3a5080261f1bd717b869ab2b944de8f6b870 (patch) | |
| tree | 440894247a12513a28b82adee1d8b8a4e06d0f4b /scumm/script_v5.cpp | |
| parent | 207f164cc69ceae8f3412c6ebedce02f3aad72f5 (diff) | |
| download | scummvm-rg350-158a3a5080261f1bd717b869ab2b944de8f6b870.tar.gz scummvm-rg350-158a3a5080261f1bd717b869ab2b944de8f6b870.tar.bz2 scummvm-rg350-158a3a5080261f1bd717b869ab2b944de8f6b870.zip | |
added specific opcodes for indy ega same as at indy 256, and dummy opcode for loom ega
svn-id: r7006
Diffstat (limited to 'scumm/script_v5.cpp')
| -rw-r--r-- | scumm/script_v5.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 0b4a306477..37371627ed 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -949,8 +949,12 @@ void Scumm_v5::o5_getActorRoom() { } void Scumm_v5::o5_getActorScale() { + // dummy opcode in the loom + if (_gameId == GID_LOOM) + return; + // INDY3 uses this opcode as a wait_for_actor(); - if (_gameId == GID_INDY3_256) { + if ((_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) { byte *oldaddr = _scriptPointer - 1; if (derefActorSafe(getVarOrDirectByte(0x80), "o5_wait")->moving) { _scriptPointer = oldaddr; @@ -2248,7 +2252,7 @@ void Scumm_v5::o5_wait() { oldaddr = _scriptPointer - 1; - if (_gameId == GID_INDY3_256) { + if ((_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) { _opcode = 2; } else _opcode = fetchScriptByte(); |