[Scummvm-git-logs] scummvm master -> 77d51dcbe403e699985b6bef0334ca725340aef5

dreammaster dreammaster at scummvm.org
Thu Dec 1 03:09:59 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:
77d51dcbe4 TITANIC: Fix showing magazine ad on TV channel 3


Commit: 77d51dcbe403e699985b6bef0334ca725340aef5
    https://github.com/scummvm/scummvm/commit/77d51dcbe403e699985b6bef0334ca725340aef5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-30T21:09:54-05:00

Commit Message:
TITANIC: Fix showing magazine ad on TV channel 3

Changed paths:
    engines/titanic/game/television.cpp


diff --git a/engines/titanic/game/television.cpp b/engines/titanic/game/television.cpp
index 081112e..390d855 100644
--- a/engines/titanic/game/television.cpp
+++ b/engines/titanic/game/television.cpp
@@ -235,7 +235,7 @@ bool CTelevision::MovieEndMsg(CMovieEndMsg *msg) {
 		parrotMsg.execute("PerchedParrot");
 	}
 
-	if (_channelNum == 3 && compareRoomNameTo("SGTState") && !getPassengerClass()) {
+	if (_channelNum == 3 && compareRoomNameTo("SGTState") && getPassengerClass() == THIRD_CLASS) {
 		playSound("z#47.wav");
 		_soundHandle = playSound("b#20.wav");
 		CMagazine *magazine = dynamic_cast<CMagazine *>(getRoot()->findByName("Magazine"));





More information about the Scummvm-git-logs mailing list