diff options
| -rw-r--r-- | engines/hopkins/objects.cpp | 4 | ||||
| -rw-r--r-- | engines/hopkins/talk.cpp | 16 | ||||
| -rw-r--r-- | engines/hopkins/talk.h | 10 |
3 files changed, 14 insertions, 16 deletions
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index 7b0e57c9d7..c6a4910ef3 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -2075,9 +2075,9 @@ void ObjectsManager::PARADISE() { _vm->_eventsManager->refreshScreenAndEvents(); _vm->_graphicsManager->_scrollStatus = 0; } - _vm->_talkManager->REPONSE(_vm->_globals->_saveData->_data[svLastZoneNum], _vm->_globals->_saveData->_data[svLastMouseCursor]); + _vm->_talkManager->handleAnswer(_vm->_globals->_saveData->_data[svLastZoneNum], _vm->_globals->_saveData->_data[svLastMouseCursor]); } else { - _vm->_talkManager->REPONSE2(_vm->_globals->_saveData->_data[svLastZoneNum], _vm->_globals->_saveData->_data[svLastMouseCursor]); + _vm->_talkManager->handleForestAnswser(_vm->_globals->_saveData->_data[svLastZoneNum], _vm->_globals->_saveData->_data[svLastMouseCursor]); } _vm->_eventsManager->changeMouseCursor(4); if (_zoneNum != -1 && _zoneNum != 0 && !_vm->_linesManager->_zone[_zoneNum]._enabledFl) { diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp index a69ae59c94..bf31292cda 100644 --- a/engines/hopkins/talk.cpp +++ b/engines/hopkins/talk.cpp @@ -368,7 +368,7 @@ int TalkManager::dialogAnswer(int idx, bool animatedFl) { if (curVal) _vm->_objectsManager->stopBobAnimation(curVal); } else { - VISU_PARLE(); + dialogAnim(); } bool displayedTxtFl = false; @@ -467,7 +467,7 @@ void TalkManager::searchCharacterPalette(int startIdx, bool dark) { void TalkManager::dialogWait() { for (int idx = 26; idx <= 30; ++idx) { if (_vm->_animationManager->_animBqe[idx]._enabledFl) - BOB_VISU_PARLE(idx); + displayBobDialogAnim(idx); } } @@ -586,14 +586,14 @@ int TalkManager::countBoxLines(int idx, const Common::String &file) { return lineCount; } -void TalkManager::VISU_PARLE() { +void TalkManager::dialogAnim() { for (int idx = 21; idx <= 25; ++idx) { if (_vm->_animationManager->_animBqe[idx]._enabledFl) - BOB_VISU_PARLE(idx); + displayBobDialogAnim(idx); } } -void TalkManager::BOB_VISU_PARLE(int idx) { +void TalkManager::displayBobDialogAnim(int idx) { _vm->_objectsManager->_priorityFl = true; if (!_vm->_objectsManager->_bob[idx]._bobMode) { _vm->_objectsManager->resetBob(idx); @@ -754,7 +754,7 @@ bool TalkManager::searchCharacterAnim(int idx, const byte *bufPerso, int animId, return result; } -void TalkManager::REPONSE(int zone, int verb) { +void TalkManager::handleAnswer(int zone, int verb) { byte zoneObj = zone; byte verbObj = verb; @@ -853,7 +853,7 @@ void TalkManager::REPONSE(int zone, int verb) { return; } -void TalkManager::REPONSE2(int zone, int verb) { +void TalkManager::handleForestAnswser(int zone, int verb) { int indx = 0; if (verb != 5 || _vm->_globals->_saveData->_data[svLastObjectIndex] != 4) return; @@ -1011,7 +1011,7 @@ void TalkManager::animateObject(const Common::String &filename) { _vm->_globals->_actionMoveTo = false; _vm->_objectsManager->_zoneNum = -1; initCharacterAnim(); - VISU_PARLE(); + dialogAnim(); dialogWait(); _vm->_graphicsManager->initScreen(screenFilename, 2, true); _vm->_globals->_freezeCharacterFl = true; diff --git a/engines/hopkins/talk.h b/engines/hopkins/talk.h index 5a50c83617..678f52090a 100644 --- a/engines/hopkins/talk.h +++ b/engines/hopkins/talk.h @@ -57,9 +57,8 @@ private: void clearCharacterAnim(); bool searchCharacterAnim(int idx, const byte *bufPerso, int animId, int bufferSize); int countBoxLines(int idx, const Common::String &file); - - void VISU_PARLE(); - void BOB_VISU_PARLE(int idx); + void dialogAnim(); + void displayBobDialogAnim(int idx); public: byte *_characterAnim; @@ -70,9 +69,8 @@ public: void startStaticCharacterDialogue(const Common::String &filename); void startAnimatedCharacterDialogue(const Common::String &filename); void animateObject(const Common::String &filename); - - void REPONSE(int zone, int verb); - void REPONSE2(int zone, int verb); + void handleAnswer(int zone, int verb); + void handleForestAnswser(int zone, int verb); }; } // End of namespace Hopkins |