[Scummvm-git-logs] scummvm master -> 676d26a37ef0b31b2fa350a193e9cea7eca54a2a

dreammaster dreammaster at scummvm.org
Thu Dec 8 02:44:39 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:
676d26a37e TITANIC: Fix lift passenger class transitioning


Commit: 676d26a37ef0b31b2fa350a193e9cea7eca54a2a
    https://github.com/scummvm/scummvm/commit/676d26a37ef0b31b2fa350a193e9cea7eca54a2a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-07T20:44:33-05:00

Commit Message:
TITANIC: Fix lift passenger class transitioning

Changed paths:
    engines/titanic/game/transport/lift.cpp


diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp
index 114e840..52c33c7 100644
--- a/engines/titanic/game/transport/lift.cpp
+++ b/engines/titanic/game/transport/lift.cpp
@@ -76,15 +76,15 @@ bool CLift::StatusChangeMsg(CStatusChangeMsg *msg) {
 
 	int oldFloorNum = msg->_oldStatus;
 	int floorNum = msg->_newStatus;
-	int oldClass = 0, newClass = 0;
-	if (oldFloorNum == 19)
-		oldClass = 2;
-	if (oldFloorNum == 27)
+	int oldClass = 1, newClass = 1;
+	if (oldFloorNum > 27)
 		oldClass = 3;
-	if (floorNum == 19)
-		newClass = 2;
-	if (floorNum == 27)
+	else if (oldFloorNum > 19)
+		oldClass = 2;
+	if (floorNum > 27)
 		newClass = 3;
+	else if (floorNum > 19)
+		newClass = 2;
 
 	static const int UP_FRAME_NUMBERS[40] = {
 		0, 8, 13, 18, 23, 28, 33, 38, 43, 48, 53, 58,





More information about the Scummvm-git-logs mailing list