diff options
| author | Paul Gilbert | 2016-11-11 22:05:24 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-11-11 22:05:24 -0500 |
| commit | 6ab6fb8b1907315bf61a1c29095c83692e9f46be (patch) | |
| tree | 85ee56e29ca53b8bc584b3ab52c8c627451dead2 | |
| parent | ace9cfe60d658cbf364738d923212839dcdc2d02 (diff) | |
| download | scummvm-rg350-6ab6fb8b1907315bf61a1c29095c83692e9f46be.tar.gz scummvm-rg350-6ab6fb8b1907315bf61a1c29095c83692e9f46be.tar.bz2 scummvm-rg350-6ab6fb8b1907315bf61a1c29095c83692e9f46be.zip | |
TITANIC: Fix leaving lift at SGT floor
| -rw-r--r-- | engines/titanic/game/pet/pet_position.cpp | 4 | ||||
| -rw-r--r-- | 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 d3d030eb16..db6f9997c9 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 de9a3117af..a85af7c7a2 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) { |