[Scummvm-git-logs] scummvm master -> 6ab6fb8b1907315bf61a1c29095c83692e9f46be

[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:
6ab6fb8b19 TITANIC: Fix leaving lift at SGT floor


Commit: 6ab6fb8b1907315bf61a1c29095c83692e9f46be
    https://github.com/scummvm/scummvm/commit/6ab6fb8b1907315bf61a1c29095c83692e9f46be
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-11T22:05:24-05:00

Commit Message:
TITANIC: Fix leaving lift at SGT floor

Changed paths:
    engines/titanic/game/pet/pet_position.cpp
    engines/titanic/moves/exit_lift.cpp



diff --git a/engines/titanic/game/pet/pet_position.cpp b/engines/titanic/game/pet/pet_position.cpp
index d3d030e..db6f999 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 de9a311..a85af7c 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) {