diff options
| author | James Brown | 2002-10-23 03:28:06 +0000 |
|---|---|---|
| committer | James Brown | 2002-10-23 03:28:06 +0000 |
| commit | 500be1e535298a734adc9c335bb533fc6a915dfe (patch) | |
| tree | 88a8abf1affea43137454a908d330224d3758253 /scumm | |
| parent | 4129aaf3cd58cc8fc1e3244e2f9732ec2b15b840 (diff) | |
| download | scummvm-rg350-500be1e535298a734adc9c335bb533fc6a915dfe.tar.gz scummvm-rg350-500be1e535298a734adc9c335bb533fc6a915dfe.tar.bz2 scummvm-rg350-500be1e535298a734adc9c335bb533fc6a915dfe.zip | |
Make some BOMP'ed Dig events a little more happy
svn-id: r5272
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/object.cpp | 6 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 1a48d8e3a4..a27ea03f9e 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -1158,8 +1158,10 @@ void Scumm::enqueueObject(int objectNumber, int objectX, int objectY, int object 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; diff --git a/scumm/scumm.h b/scumm/scumm.h index 1db38a5bc9..eb767a47ed 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -859,7 +859,7 @@ public: 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; } |