diff options
| author | Paul Gilbert | 2017-07-24 21:02:50 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-07-24 21:02:50 -0400 |
| commit | 7e74c575da51193ac5be212b8b4a5dae2b011200 (patch) | |
| tree | f80f964cbd8fc7a6c1b592dc0d6b977b6e2b1d83 | |
| parent | 231d9ba4d86e3951b083cab2bc34bc02e5d2807c (diff) | |
| download | scummvm-rg350-7e74c575da51193ac5be212b8b4a5dae2b011200.tar.gz scummvm-rg350-7e74c575da51193ac5be212b8b4a5dae2b011200.tar.bz2 scummvm-rg350-7e74c575da51193ac5be212b8b4a5dae2b011200.zip | |
TITANIC: Fix conversation with Liftbot not working after twirling around
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/true_talk/liftbot_script.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 870e9d420d..3619d56330 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1274,7 +1274,7 @@ bool CGameObject::clipExistsByEnd(const CString &name, int endFrame) const { void CGameObject::petClear() const { CPetControl *petControl = getPetControl(); if (petControl) - petControl->resetActiveNPC(); + petControl->resetRemoteTarget(); } CDontSaveFileItem *CGameObject::getDontSave() const { diff --git a/engines/titanic/true_talk/liftbot_script.cpp b/engines/titanic/true_talk/liftbot_script.cpp index 237f6286eb..5f0f6fbb66 100644 --- a/engines/titanic/true_talk/liftbot_script.cpp +++ b/engines/titanic/true_talk/liftbot_script.cpp @@ -359,7 +359,7 @@ uint LiftbotScript::getDialsBitset() const { int LiftbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScript *roomScript, const TTsentence *sentence) { // Responses for each floor when asked "what floor are we on" static const int FLOOR_RESPONSE_IDS[] = { - 210724, 210735, 210746, 210757, 210758, 210759, 210760, + 0, 210724, 210735, 210746, 210757, 210758, 210759, 210760, 210761, 210762, 210725, 210726, 210727, 210728, 210729, 210730, 210731, 210732, 210733, 210734, 210736, 210737, 210738, 210739, 210740, 210741, 210742, 210743, 210744, @@ -428,7 +428,7 @@ int LiftbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScri break; case 13: // What floor am I on - selectResponse(FLOOR_RESPONSE_IDS[getCurrentFloor() - 1]); + selectResponse(FLOOR_RESPONSE_IDS[getCurrentFloor()]); applyResponse(); return 2; case 14: |