[Scummvm-git-logs] scummvm master -> 7e74c575da51193ac5be212b8b4a5dae2b011200

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7e74c575da TITANIC: Fix conversation with Liftbot not working after twirling around


Commit: 7e74c575da51193ac5be212b8b4a5dae2b011200
    https://github.com/scummvm/scummvm/commit/7e74c575da51193ac5be212b8b4a5dae2b011200
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-24T21:02:50-04:00

Commit Message:
TITANIC: Fix conversation with Liftbot not working after twirling around

Changed paths:
    engines/titanic/core/game_object.cpp
    engines/titanic/true_talk/liftbot_script.cpp


diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 870e9d4..3619d56 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 237f628..5f0f6fb 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: