diff options
| -rw-r--r-- | engines/hopkins/dialogs.cpp | 2 | ||||
| -rw-r--r-- | engines/hopkins/objects.cpp | 12 | ||||
| -rw-r--r-- | engines/hopkins/objects.h | 8 | ||||
| -rw-r--r-- | engines/hopkins/script.cpp | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp index 48640aa824..d756f0db6f 100644 --- a/engines/hopkins/dialogs.cpp +++ b/engines/hopkins/dialogs.cpp @@ -437,7 +437,7 @@ void DialogsManager::showInventory() { _vm->_globals->_saveData->_data[svLastObjectIndex] = _vm->_objectsManager->_curObjectIndex; _vm->_globals->_saveData->_data[svLastInventoryItem] = _vm->_globals->_inventory[newInventoryItem]; _vm->_globals->_saveData->_data[svLastInvMouseCursor] = _vm->_eventsManager->_mouseCursorId; - _vm->_objectsManager->OPTI_OBJET(); + _vm->_objectsManager->loadObjectIniFile(); _vm->_scriptManager->_tempObjectFl = false; if (_vm->_soundManager->_voiceOffFl) { diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index b6c1f628a7..fdfb926b98 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -2596,7 +2596,7 @@ void ObjectsManager::takeInventoryObject(int idx) { changeObject(idx); } -void ObjectsManager::OPTI_OBJET() { +void ObjectsManager::loadObjectIniFile() { byte *data; Common::String file; int lastOpcodeResult = 1; @@ -2760,7 +2760,7 @@ void ObjectsManager::handleSpecialGames() { } } -void ObjectsManager::BOB_VIVANT(int idx) { +void ObjectsManager::quickDisplayBobSprite(int idx) { int startPos = 10 * idx; if (!READ_LE_UINT16(_vm->_talkManager->_characterAnim + startPos + 4)) return; @@ -2772,7 +2772,7 @@ void ObjectsManager::BOB_VIVANT(int idx) { _vm->_graphicsManager->fastDisplay(_vm->_talkManager->_characterSprite, xp, yp, spriteIndex); } -void ObjectsManager::VBOB(byte *src, int idx, int xp, int yp, int frameIndex) { +void ObjectsManager::initVbob(byte *src, int idx, int xp, int yp, int frameIndex) { if (idx > 29) error("MAX_VBOB exceeded"); @@ -2801,7 +2801,7 @@ void ObjectsManager::VBOB(byte *src, int idx, int xp, int yp, int frameIndex) { } } -void ObjectsManager::VBOB_OFF(int idx) { +void ObjectsManager::disableVbob(int idx) { if (idx > 29) error("MAX_VBOB exceeded"); @@ -3273,7 +3273,7 @@ void ObjectsManager::sceneSpecialIni() { animateSprite(0); for (int i = 0; i <= 4; i++) _vm->_eventsManager->refreshScreenAndEvents(); - VBOB(_vm->_globals->_levelSpriteBuf, 5, 15, 28, 1); + initVbob(_vm->_globals->_levelSpriteBuf, 5, 15, 28, 1); _vm->_fontManager->hideText(9); bool displayedTxtFl = false; if (!_vm->_soundManager->_textOffFl) { @@ -3291,7 +3291,7 @@ void ObjectsManager::sceneSpecialIni() { _vm->_eventsManager->refreshScreenAndEvents(); } _vm->_fontManager->hideText(9); - VBOB_OFF(5); + disableVbob(5); for (int i = 0; i <= 3; i++) _vm->_eventsManager->refreshScreenAndEvents(); _vm->_graphicsManager->_noFadingFl = true; diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h index efa468e447..3b1375c2a1 100644 --- a/engines/hopkins/objects.h +++ b/engines/hopkins/objects.h @@ -320,15 +320,15 @@ public: void showSpecialActionAnimation(byte *spriteData, const Common::String &animString, int speed); void checkEventBobAnim(int idx, int animIdx, int animDataIdx, int a4); void setMultiBobAnim(int idx1, int idx2, int anim1Idx, int anim2Idx); + void loadObjectIniFile(); + void quickDisplayBobSprite(int idx); + void initVbob(byte *src, int idx, int xp, int yp, int frameIndex); + void disableVbob(int idx); void PERSONAGE(const Common::String &backgroundFile, const Common::String &linkFile, const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen); void PERSONAGE2(const Common::String &backgroundFile, const Common::String &linkFile, const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen); - void OPTI_OBJET(); - void BOB_VIVANT(int idx); - void VBOB(byte *src, int idx, int xp, int yp, int frameIndex); - void VBOB_OFF(int idx); void OPTI_ONE(int idx, int animIdx, int destPosi, int animAction); void GOHOME(); void PARADISE(); diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp index 9c30f590e0..fec07e632e 100644 --- a/engines/hopkins/script.cpp +++ b/engines/hopkins/script.cpp @@ -182,9 +182,9 @@ int ScriptManager::handleOpcode(byte *dataP) { if (vbobIdx == 52) { _vm->_graphicsManager->fastDisplay(_vm->_globals->_levelSpriteBuf, vbobPosX, READ_LE_INT16(dataP + 10), vbobFrameIndex); } else if (vbobIdx == 51) { - _vm->_objectsManager->BOB_VIVANT(vbobFrameIndex); + _vm->_objectsManager->quickDisplayBobSprite(vbobFrameIndex); } else if (vbobIdx != 50) { - _vm->_objectsManager->VBOB(_vm->_globals->_levelSpriteBuf, vbobIdx, vbobPosX, vbobPosY, vbobFrameIndex); + _vm->_objectsManager->initVbob(_vm->_globals->_levelSpriteBuf, vbobIdx, vbobPosX, vbobPosY, vbobFrameIndex); if (moveChange) moveChange /= _vm->_globals->_speed; if (moveChange > 1) { @@ -271,7 +271,7 @@ int ScriptManager::handleOpcode(byte *dataP) { break; case MKTAG24('B', 'O', 'F'): if (!_vm->_objectsManager->_disableFl) - _vm->_objectsManager->VBOB_OFF(READ_LE_INT16(dataP + 5)); + _vm->_objectsManager->disableVbob(READ_LE_INT16(dataP + 5)); opcodeType = 1; break; case MKTAG24('P', 'E', 'R'): { |