[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.6,1.7 scumm.h,1.45,1.46

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv19728/scumm

Modified Files:
	object.cpp scumm.h 
Log Message:
Make some BOMP'ed Dig events a little more happy


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- object.cpp	11 Oct 2002 11:50:06 -0000	1.6
+++ object.cpp	23 Oct 2002 03:28:06 -0000	1.7
@@ -1158,8 +1158,10 @@
 	BlastObject *eo;
 	ObjectData *od;
 
-	if (_enqueuePos == sizeof(_enqueuedObjects) / sizeof(_enqueuedObjects[0]))
-		error("enqueueObject: overflow");
+	if (_enqueuePos == sizeof(_enqueuedObjects) / sizeof(_enqueuedObjects[0])) {
+		warning("enqueueObject: overflow");
+		return;
+	}
 
 	eo = &_enqueuedObjects[_enqueuePos++];
 	eo->number = objectNumber;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- scumm.h	23 Oct 2002 00:24:54 -0000	1.45
+++ scumm.h	23 Oct 2002 03:28:06 -0000	1.46
@@ -859,7 +859,7 @@
 	int _screenLeft, _screenTop;
 	uint16 _enqueue_b, _enqueue_c, _enqueue_d, _enqueue_e;
 	int _enqueuePos; 
-	BlastObject _enqueuedObjects[32];
+	BlastObject _enqueuedObjects[128];
 
 	void enqueueObject(int a, int b, int c, int d, int e, int f, int g, int h, int mode);
 	void clearEnqueue() { _enqueuePos = 0; }