diff options
author | Max Horn | 2003-01-16 00:40:19 +0000 |
---|---|---|
committer | Max Horn | 2003-01-16 00:40:19 +0000 |
commit | 8ad002b3a3f7d45d6056729c94b5fd4acdc24a9f (patch) | |
tree | f79236ce3ab9645e506eb5b37a914f81d200b654 /scumm/object.cpp | |
parent | ec006a4357a7aec841164ed1207f38cd03f540b1 (diff) | |
download | scummvm-rg350-8ad002b3a3f7d45d6056729c94b5fd4acdc24a9f.tar.gz scummvm-rg350-8ad002b3a3f7d45d6056729c94b5fd4acdc24a9f.tar.bz2 scummvm-rg350-8ad002b3a3f7d45d6056729c94b5fd4acdc24a9f.zip |
first blastText version. this is work in progress (note that e.g. text is not clipped, and the extra information is not removed)
svn-id: r6472
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r-- | scumm/object.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 500b14c0ea..600c176ed1 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -1271,12 +1271,12 @@ void Scumm::enqueueObject(int objectNumber, int objectX, int objectY, int object BlastObject *eo; ObjectData *od; - if (_enqueuePos == sizeof(_enqueuedObjects) / sizeof(_enqueuedObjects[0])) { + if (_blastObjectQueuePos == sizeof(_blastObjectQueue) / sizeof(_blastObjectQueue[0])) { warning("enqueueObject: overflow"); return; } - eo = &_enqueuedObjects[_enqueuePos++]; + eo = &_blastObjectQueue[_blastObjectQueuePos++]; eo->number = objectNumber; eo->posX = objectX + (camera._cur.x & 7); eo->posY = objectY + (camera._cur.y - (_realHeight / 2)); @@ -1305,8 +1305,8 @@ void Scumm::drawBlastObjects() BlastObject *eo; int i; - eo = _enqueuedObjects; - for (i = 0; i < _enqueuePos; i++, eo++) { + eo = _blastObjectQueue; + for (i = 0; i < _blastObjectQueuePos; i++, eo++) { drawBlastObject(eo); } } @@ -1568,8 +1568,8 @@ void Scumm::removeBlastObjects() BlastObject *eo; int i; - eo = _enqueuedObjects; - for (i = 0; i < _enqueuePos; i++, eo++) { + eo = _blastObjectQueue; + for (i = 0; i < _blastObjectQueuePos; i++, eo++) { removeBlastObject(eo); } |