aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-11-10 20:03:57 -0500
committerPaul Gilbert2016-11-10 20:03:57 -0500
commitc0b95cd234a82d8d782d2e2fa9d4cb9f80e23b22 (patch)
treecc21091b22a6af30b8c9d1a168d275a46a218d26
parent1f2be2bb40c81da884b8d437af72771c6c13157e (diff)
downloadscummvm-rg350-c0b95cd234a82d8d782d2e2fa9d4cb9f80e23b22.tar.gz
scummvm-rg350-c0b95cd234a82d8d782d2e2fa9d4cb9f80e23b22.tar.bz2
scummvm-rg350-c0b95cd234a82d8d782d2e2fa9d4cb9f80e23b22.zip
TITANIC: Fix to start conversation with LiftBot
-rw-r--r--engines/titanic/npcs/liftbot.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/engines/titanic/npcs/liftbot.cpp b/engines/titanic/npcs/liftbot.cpp
index 04448fc277..105c4aafe9 100644
--- a/engines/titanic/npcs/liftbot.cpp
+++ b/engines/titanic/npcs/liftbot.cpp
@@ -79,13 +79,12 @@ bool CLiftBot::EnterViewMsg(CEnterViewMsg *msg) {
CPetControl *pet = getPetControl();
if (!_enabled && pet->getRoomsElevatorNum() == 4) {
loadFrame(700);
- } else if (!_flag) {
- if (getName() != "LiftBot") {
- CViewItem *view = findView();
- setTalking(this, true, view);
- petSetArea(PET_CONVERSATION);
- _flag = 1;
- }
+ } else if (!_flag && getName() == "LiftBot") {
+ // First time meeting the LiftBot
+ CViewItem *view = findView();
+ setTalking(this, true, view);
+ petSetArea(PET_CONVERSATION);
+ _flag = 1;
}
return true;