[Scummvm-cvs-logs] CVS: scummvm/scumm script_v1.cpp,1.28,1.29

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv18218

Modified Files:
	script_v1.cpp 
Log Message:
FIXME in pickupObjectOld should be obsolete now

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v1.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- script_v1.cpp	23 Nov 2002 13:53:46 -0000	1.28
+++ script_v1.cpp	23 Nov 2002 20:58:46 -0000	1.29
@@ -2281,7 +2281,7 @@
 
 	oldaddr = _scriptPointer - 1;
 
-	if (_opcode == 0xAE && _gameId == GID_INDY3_256) {
+	if (_gameId == GID_INDY3_256) {
 		_opcode = 2;
 	} else
 		_opcode = fetchScriptByte();
@@ -2544,11 +2544,8 @@
 {
 	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)