[Scummvm-git-logs] scummvm master -> ace9cfe60d658cbf364738d923212839dcdc2d02
dreammaster
dreammaster at scummvm.org
Sat Nov 12 03:27:49 CET 2016
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:
ace9cfe60d TITANIC: Fix using remote to go to assigned room floor
Commit: ace9cfe60d658cbf364738d923212839dcdc2d02
https://github.com/scummvm/scummvm/commit/ace9cfe60d658cbf364738d923212839dcdc2d02
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-11T21:27:44-05:00
Commit Message:
TITANIC: Fix using remote to go to assigned room floor
Changed paths:
engines/titanic/game/pet/pet_lift.cpp
diff --git a/engines/titanic/game/pet/pet_lift.cpp b/engines/titanic/game/pet/pet_lift.cpp
index a7b4885..75a48a6 100644
--- a/engines/titanic/game/pet/pet_lift.cpp
+++ b/engines/titanic/game/pet/pet_lift.cpp
@@ -50,8 +50,8 @@ bool CPETLift::TransportMsg(CTransportMsg *msg) {
} else if (msg->_roomName == "BottomOfWell") {
floorNum = 39;
} else if (msg->_roomName == "PlayersRoom" && pet) {
- int assignedFloor = pet->getAssignedFloorNum();
- if (assignedFloor < 1 || assignedFloor > 39) {
+ floorNum = pet->getAssignedFloorNum();
+ if (floorNum < 1 || floorNum > 39) {
pet->petDisplayMessage(NO_ROOM_ASSIGNED);
floorNum = -1;
}
More information about the Scummvm-git-logs
mailing list