aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic
diff options
context:
space:
mode:
authorPaul Gilbert2016-12-07 20:44:33 -0500
committerPaul Gilbert2016-12-07 20:44:33 -0500
commit676d26a37ef0b31b2fa350a193e9cea7eca54a2a (patch)
tree526729a7349dcf45e64b6e02ec62e36aa6428afa /engines/titanic
parentde9e04d75fad2e0d893ba38315f0361ae58bc3e6 (diff)
downloadscummvm-rg350-676d26a37ef0b31b2fa350a193e9cea7eca54a2a.tar.gz
scummvm-rg350-676d26a37ef0b31b2fa350a193e9cea7eca54a2a.tar.bz2
scummvm-rg350-676d26a37ef0b31b2fa350a193e9cea7eca54a2a.zip
TITANIC: Fix lift passenger class transitioning
Diffstat (limited to 'engines/titanic')
-rw-r--r--engines/titanic/game/transport/lift.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp
index 114e840007..52c33c7843 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,