From ca513a2dfd60e488ee3382d8f1089d0079c5dc5c Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 23 Nov 2002 20:58:46 +0000 Subject: [PATCH] FIXME in pickupObjectOld should be obsolete now svn-id: r5702 --- scumm/script_v1.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scumm/script_v1.cpp b/scumm/script_v1.cpp index f1cee31520b..482ed33b3b2 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)