diff options
author | Gregory Montoir | 2004-01-23 10:34:57 +0000 |
---|---|---|
committer | Gregory Montoir | 2004-01-23 10:34:57 +0000 |
commit | 82e005fe5ad3803745b47f15fe8463b7709bf1a3 (patch) | |
tree | 0070e6cf67e22ba6880ac795cc72f08d35e1bfd3 /queen | |
parent | 28b365803b3e1dbffb453bb53b23dfa7db9e7277 (diff) | |
download | scummvm-rg350-82e005fe5ad3803745b47f15fe8463b7709bf1a3.tar.gz scummvm-rg350-82e005fe5ad3803745b47f15fe8463b7709bf1a3.tar.bz2 scummvm-rg350-82e005fe5ad3803745b47f15fe8463b7709bf1a3.zip |
use BobSlot::clear instead of Graphics::clearBob
svn-id: r12580
Diffstat (limited to 'queen')
-rw-r--r-- | queen/cutaway.cpp | 4 | ||||
-rw-r--r-- | queen/graphics.cpp | 13 | ||||
-rw-r--r-- | queen/graphics.h | 1 |
3 files changed, 6 insertions, 12 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index c5e811598e..0b5d2a7e21 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -1097,7 +1097,7 @@ void Cutaway::stop() { ObjectData *from = _vm->logic()->objectData(fromIndex); if (object->image && !from->image && bobIndex && _vm->logic()->currentRoom() == object->room) - _vm->graphics()->clearBob(bobIndex); + _vm->graphics()->bob(bobIndex)->clear(); } if (_vm->logic()->currentRoom() == room) @@ -1125,7 +1125,7 @@ void Cutaway::stop() { int objectFrame = _vm->logic()->findFrame(objectIndex); if (objectFrame == 1000) { - _vm->graphics()->clearBob(bobIndex); + _vm->graphics()->bob(bobIndex)->clear(); } else if (objectFrame) { _vm->bankMan()->unpack(ABS(frame), objectFrame, bank); diff --git a/queen/graphics.cpp b/queen/graphics.cpp index a5ec6c6c9b..80de743969 100644 --- a/queen/graphics.cpp +++ b/queen/graphics.cpp @@ -314,11 +314,6 @@ void Graphics::shrinkFrame(const BobFrame *bf, uint16 percentage) { } } -void Graphics::clearBob(uint32 bobNum) { - BobSlot *pbs = bob(bobNum); - pbs->clear(); -} - void Graphics::sortBobs() { _sortedBobsCount = 0; @@ -393,7 +388,7 @@ void Graphics::drawBobs() { void Graphics::clearBobs() { for(int32 i = 0; i < ARRAYSIZE(_bobs); ++i) { - clearBob(i); + _bobs[i].clear(); } } @@ -782,7 +777,7 @@ uint16 Graphics::refreshObject(uint16 obj) { if (pod->image == -3 || pod->image == -4) { // a person object if (pod->name <= 0) { - clearBob(curBob); + pbs->clear(); } else { // find person number uint16 pNum = _vm->logic()->findPersonNumber(obj); @@ -800,7 +795,7 @@ uint16 Graphics::refreshObject(uint16 obj) { if (pod->name < 0 || pod->image < 0) { // object is hidden or disabled - clearBob(curBob); + pbs->clear(); return curImage; } @@ -982,7 +977,7 @@ void Graphics::setupRoomObjects() { // static objects curBob = 20 + _numFurnitureStatic + numObjectStatic; ++curImage; - clearBob(curBob); + bob(curBob)->clear(); _vm->bankMan()->unpack(pgd->firstFrame, curImage, 15); ++_numFrames; diff --git a/queen/graphics.h b/queen/graphics.h index 46a86f5e9f..f786e20703 100644 --- a/queen/graphics.h +++ b/queen/graphics.h @@ -101,7 +101,6 @@ public: void drawInventoryItem(uint32 frameNum, uint16 x, uint16 y); void pasteBob(uint16 objNum, uint16 image); void shrinkFrame(const BobFrame *bf, uint16 percentage); - void clearBob(uint32 bobNum); void sortBobs(); void drawBobs(); void clearBobs(); |