diff options
author | Gregory Montoir | 2004-01-09 13:36:37 +0000 |
---|---|---|
committer | Gregory Montoir | 2004-01-09 13:36:37 +0000 |
commit | 634df6923d644a5de603beb14c5f9720b5ff44fb (patch) | |
tree | b44aebd45f697dfe1c448ee460f204e2fa7945ac /queen/cutaway.cpp | |
parent | 93f3c0df348b77d284d66309e36d775df4765c99 (diff) | |
download | scummvm-rg350-634df6923d644a5de603beb14c5f9720b5ff44fb.tar.gz scummvm-rg350-634df6923d644a5de603beb14c5f9720b5ff44fb.tar.bz2 scummvm-rg350-634df6923d644a5de603beb14c5f9720b5ff44fb.zip |
renamed some methods and moved some code to Display
svn-id: r12276
Diffstat (limited to 'queen/cutaway.cpp')
-rw-r--r-- | queen/cutaway.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index 213a43d641..1b3d498f86 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -418,7 +418,7 @@ void Cutaway::changeRooms(CutawayObject &object) { mode = RDM_FADE_JOE_XY; } - _vm->logic()->roomDisplay(_vm->logic()->currentRoom(), mode, object.scale, comPanel, true); + _vm->logic()->displayRoom(_vm->logic()->currentRoom(), mode, object.scale, comPanel, true); _currentImage = _vm->graphics()->numFrames(); @@ -1078,7 +1078,7 @@ void Cutaway::stop() { _vm->logic()->joePos(joeX, joeY); _vm->logic()->currentRoom(joeRoom); _vm->logic()->oldRoom(_initialRoom); - _vm->logic()->roomDisplay(_vm->logic()->currentRoom(), RDM_FADE_JOE_XY, 0, _comPanel, true); + _vm->logic()->displayRoom(_vm->logic()->currentRoom(), RDM_FADE_JOE_XY, 0, _comPanel, true); } if (_vm->input()->cutawayQuit()) { @@ -1088,7 +1088,7 @@ void Cutaway::stop() { // Stop the credits from running _vm->logic()->stopCredits(); - _vm->graphics()->bobStopAll(); + _vm->graphics()->stopBobs(); for (i = 1; i <= _personFaceCount; i++) { int index = _personFace[i].index; @@ -1124,7 +1124,7 @@ void Cutaway::stop() { ObjectData *from = _vm->logic()->objectData(fromIndex); if (object->image && !from->image && bobIndex && _vm->logic()->currentRoom() == object->room) - _vm->graphics()->bobClear(bobIndex); + _vm->graphics()->clearBob(bobIndex); } if (_vm->logic()->currentRoom() == room) @@ -1155,7 +1155,7 @@ void Cutaway::stop() { int objectFrame = _vm->logic()->findFrame(objectIndex); if (objectFrame == 1000) { - _vm->graphics()->bobClear(bobIndex); + _vm->graphics()->clearBob(bobIndex); } else if (objectFrame) { _vm->bankMan()->unpack(ABS(frame), objectFrame, bank); @@ -1341,7 +1341,7 @@ void Cutaway::handleText( int flags; if (OBJECT_TYPE_TEXT_DISPLAY == type) { - x = _vm->graphics()->textCenterX(sentence); + x = _vm->display()->textCenterX(sentence); flags = 2; } else { @@ -1352,7 +1352,7 @@ void Cutaway::handleText( BobSlot *bob = _vm->graphics()->bob( _vm->logic()->findBob(ABS(object.objectNumber)) ); - _vm->graphics()->bobSetText(bob, sentence, x, object.bobStartY, object.specialMove, flags); + _vm->graphics()->setBobText(bob, sentence, x, object.bobStartY, object.specialMove, flags); if (OBJECT_TYPE_TEXT_SPEAK == type || OBJECT_TYPE_TEXT_DISPLAY_AND_SPEAK == type) { char voiceFileName[MAX_STRING_SIZE]; @@ -1378,7 +1378,7 @@ void Cutaway::handleText( } } - _vm->graphics()->textClear(0,198); + _vm->display()->clearTexts(0,198); _vm->update(); } |