libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIXME in pickupObjectOld should be obsolete now

Browse Source 
svn-id: r5702
This commit is contained in:
Max Horn 2002-11-23 20:58:46 +00:00
parent d2b94bd0e0
commit ca513a2dfd
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scumm/script_v1.cpp
View File

@ -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)