diff options
| author | Max Horn | 2002-11-23 20:58:46 +0000 |
|---|---|---|
| committer | Max Horn | 2002-11-23 20:58:46 +0000 |
| commit | ca513a2dfd60e488ee3382d8f1089d0079c5dc5c (patch) | |
| tree | b2b9bc1a73e933c39ec09316dd6697cc24b3c920 /scumm | |
| parent | d2b94bd0e0ac80244e11d066f04ec4e44eb1c909 (diff) | |
| download | scummvm-rg350-ca513a2dfd60e488ee3382d8f1089d0079c5dc5c.tar.gz scummvm-rg350-ca513a2dfd60e488ee3382d8f1089d0079c5dc5c.tar.bz2 scummvm-rg350-ca513a2dfd60e488ee3382d8f1089d0079c5dc5c.zip | |
FIXME in pickupObjectOld should be obsolete now
svn-id: r5702
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v1.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/scumm/script_v1.cpp b/scumm/script_v1.cpp index f1cee31520..482ed33b3b 100644 --- a/scumm/script_v1.cpp +++ b/scumm/script_v1.cpp @@ -2281,7 +2281,7 @@ void Scumm::o5_wait() oldaddr = _scriptPointer - 1; - if (_opcode == 0xAE && _gameId == GID_INDY3_256) { + if (_gameId == GID_INDY3_256) { _opcode = 2; } else _opcode = fetchScriptByte(); @@ -2544,11 +2544,8 @@ void Scumm::o5_pickupObjectOld() { int obj = getVarOrDirectWord(0x80); - // FIXME: Zak256 (Zaire): Why does this happen at all? if (obj < 1) { - warning("pickupObjectOld received negative index %d (0x%02x)", obj, obj); -printf("_currentScript = %d / %d\n", _currentScript, vm.slot[_currentScript].number); - return; + error("pickupObjectOld received invalid index %d (script %d)", obj, vm.slot[_currentScript].number); } if (getObjectIndex(obj) == -1) |