[Scummvm-git-logs] scummvm master -> 0ae74f5a0b7e79ed89b94dc7a66277a8787a98bb

[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:
0ae74f5a0b TITANIC: Fix animation going when going upwards in elevators


Commit: 0ae74f5a0b7e79ed89b94dc7a66277a8787a98bb
    https://github.com/scummvm/scummvm/commit/0ae74f5a0b7e79ed89b94dc7a66277a8787a98bb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-18T09:43:16-05:00

Commit Message:
TITANIC: Fix animation going when going upwards in elevators

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 52c33c7..c38e8a9 100644
--- a/engines/titanic/game/transport/lift.cpp
+++ b/engines/titanic/game/transport/lift.cpp
@@ -96,7 +96,7 @@ bool CLift::StatusChangeMsg(CStatusChangeMsg *msg) {
 		598, 589, 584, 579, 574, 569, 564, 559, 554, 549,
 		544, 539, 534, 529, 524, 519, 514, 509, 504, 479,
 		474, 469, 464, 459, 454, 449, 444, 369, 364, 359,
-		354, 349, 344, 339, 334, 329, 324, 319
+		354, 349, 344, 339, 334, 329, 324, 319, 299
 	};
 
 	if (pet)
@@ -139,8 +139,8 @@ bool CLift::StatusChangeMsg(CStatusChangeMsg *msg) {
 
 	if (floorNum < oldFloorNum) {
 		// Animate lift going down
-		_startFrame = DOWN_FRAME_NUMBERS[floorNum - 1];
-		_endFrame = DOWN_FRAME_NUMBERS[oldFloorNum - 1];
+		_startFrame = DOWN_FRAME_NUMBERS[oldFloorNum - 1];
+		_endFrame = DOWN_FRAME_NUMBERS[floorNum - 1];
 
 		if (oldClass == newClass) {
 			debugStr = CString::format("Same (%d-%d)", _startFrame, _endFrame);