[Scummvm-git-logs] scummvm master -> 48d6ca6a3bf81984accf7426993d432a90df2097

[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:
48d6ca6a3b TITANIC: Workaround longer Pellerator times after loading savegames


Commit: 48d6ca6a3bf81984accf7426993d432a90df2097
    https://github.com/scummvm/scummvm/commit/48d6ca6a3bf81984accf7426993d432a90df2097
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-15T21:18:07-04:00

Commit Message:
TITANIC: Workaround longer Pellerator times after loading savegames

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


diff --git a/engines/titanic/game/transport/pellerator.cpp b/engines/titanic/game/transport/pellerator.cpp
index 7771314..8a94e82 100644
--- a/engines/titanic/game/transport/pellerator.cpp
+++ b/engines/titanic/game/transport/pellerator.cpp
@@ -297,8 +297,11 @@ bool CPellerator::EnterRoomMsg(CEnterRoomMsg *msg) {
 	int oldVal = _destination;
 
 	if (name.empty()) {
-		_destination = 4;
-		oldVal = 4;
+		// WORKAROUND: Called when loading a savegame, the original reset the
+		// destination to '4' resulting in potentially longer travel times.
+		// Since the destination is saved as part of savegames anyway, I'm
+		// changing this to leave it unchanged
+		oldVal = _destination;
 	} else if (name == "PromenadeDeck") {
 		_destination = 0;
 	} else if (name == "MusicRoomLobby") {