[Scummvm-git-logs] scummvm master -> 44aaaf43b8bd3ca32ffde185f4d9f6dd18ab2d5c

[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:
44aaaf43b8 TITANIC: Play Pellerator sound only when moving to a new destination


Commit: 44aaaf43b8bd3ca32ffde185f4d9f6dd18ab2d5c
    https://github.com/scummvm/scummvm/commit/44aaaf43b8bd3ca32ffde185f4d9f6dd18ab2d5c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-10-12T21:58:34-04:00

Commit Message:
TITANIC: Play Pellerator sound only when moving to a new destination

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 9958226..64d0fad 100644
--- a/engines/titanic/game/transport/pellerator.cpp
+++ b/engines/titanic/game/transport/pellerator.cpp
@@ -69,7 +69,6 @@ void CPellerator::load(SimpleFile *file) {
 
 bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 	setVisible(true);
-	playGlobalSound(TRANSLATE("z#74.wav", "z#605.wav"), VOL_QUIET, true, true, 0);
 	int classNum = getPassengerClass();
 	int newDest = msg->_newStatus;
 
@@ -78,6 +77,8 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 	} else if (classNum == 3 || (msg->_newStatus > 4 && classNum != 1)) {
 		petDisplayMessage(1, CLASS_NOT_ALLOWED_AT_DEST);
 	} else if (newDest > _destination) {
+		playGlobalSound(TRANSLATE("z#74.wav", "z#605.wav"), VOL_QUIET, true, true, 0);
+
 		CString name = getName();
 		changeView(name == "PelleratorObject2" ?
 			"Pellerator.Node 1.N" : "Pellerator.Node 1.S");
@@ -179,6 +180,8 @@ bool CPellerator::StatusChangeMsg(CStatusChangeMsg *msg) {
 		playMovie(264, 264, MOVIE_NOTIFY_OBJECT);
 		_destination = newDest;
 	} else if (newDest < _destination) {
+		playGlobalSound(TRANSLATE("z#74.wav", "z#605.wav"), VOL_QUIET, true, true, 0);
+
 		CString name = getName();
 		changeView(name == "PelleratorObject2" ?
 			"Pellerator.Node 1.N" : "Pellerator.Node 1.S");