[Scummvm-cvs-logs] CVS: scummvm/scumm script_v8.cpp,2.108,2.109 scummvm.cpp,2.34,2.35

[James Brown]

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

Modified Files:
	script_v8.cpp scummvm.cpp 
Log Message:
Fix ComI inventory crash, properly.


Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.108
retrieving revision 2.109
diff -u -d -r2.108 -r2.109
--- script_v8.cpp	12 Jan 2003 13:07:40 -0000	2.108
+++ script_v8.cpp	12 Jan 2003 16:34:05 -0000	2.109
@@ -1471,8 +1471,10 @@
 			eo = &_enqueuedObjects[i];
 			if (eo->posX <= args[1] && eo->width + eo->posX > args[1] &&
 			    eo->posY <= args[2] && eo->height + eo->posY > args[2]) {
-				push(eo->number);
-				return;
+                		if (!getClass(eo->number, 32)) {
+					push(eo->number);
+					return;
+				}
 			}
 		}
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.34
retrieving revision 2.35
diff -u -d -r2.34 -r2.35
--- scummvm.cpp	12 Jan 2003 13:40:12 -0000	2.34
+++ scummvm.cpp	12 Jan 2003 16:34:05 -0000	2.35
@@ -575,8 +575,6 @@
 	_system->show_mouse(_cursor.state > 0);
 
 	_vars[VAR_TIMER] = 0;
-	if (_features & GF_AFTER_V8)
-		_vars[300] = 0;	// FIXME - this fixes an inventory crash. But is it correct this way?
 	return _vars[VAR_TIMER_NEXT];
 
 }