From 6ab6fb8b1907315bf61a1c29095c83692e9f46be Mon Sep 17 00:00:00 2001 From: Paul Gilbert <dreammaster@scummvm.org> Date: Fri, 11 Nov 2016 22:05:24 -0500 Subject: [PATCH] TITANIC: Fix leaving lift at SGT floor --- engines/titanic/game/pet/pet_position.cpp | 4 ++-- engines/titanic/moves/exit_lift.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/engines/titanic/game/pet/pet_position.cpp b/engines/titanic/game/pet/pet_position.cpp index d3d030eb16c..db6f9997c97 100644 --- a/engines/titanic/game/pet/pet_position.cpp +++ b/engines/titanic/game/pet/pet_position.cpp @@ -171,8 +171,8 @@ bool CPETPosition::EnterViewMsg(CEnterViewMsg *msg) { bool CPETPosition::LeaveViewMsg(CLeaveViewMsg *msg) { CPetControl *pet = getPetControl(); - CString oldView = msg->_oldView->getName(); - CString newView = msg->_newView->getName(); + CString oldView = msg->_oldView->getFullViewName(); + CString newView = msg->_newView->getFullViewName(); if (pet && newView == "Lift.Node 1.N") { int elevatorNum = pet->getRoomsElevatorNum(); diff --git a/engines/titanic/moves/exit_lift.cpp b/engines/titanic/moves/exit_lift.cpp index de9a3117afe..a85af7c7a27 100644 --- a/engines/titanic/moves/exit_lift.cpp +++ b/engines/titanic/moves/exit_lift.cpp @@ -46,8 +46,8 @@ void CExitLift::load(SimpleFile *file) { bool CExitLift::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { CPetControl *pet = getPetControl(); - int floorNum = pet->getRoomsFloorNum();//ebx - int elevNum = pet->getRoomsElevatorNum(); //eax + int floorNum = pet->getRoomsFloorNum(); + int elevNum = pet->getRoomsElevatorNum(); if (floorNum == 39) { switch (elevNum) {