[Scummvm-git-logs] scummvm master -> 7762dae0f9816e3d25efaffe7e2b397e7d8c2bd2

dreammaster dreammaster at scummvm.org
Sat Feb 18 22:41:19 CET 2017

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

7762dae0f9 TITANIC: Fix Maitre'D playing music check

Commit: 7762dae0f9816e3d25efaffe7e2b397e7d8c2bd2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-18T16:41:14-05:00

Commit Message:
TITANIC: Fix Maitre'D playing music check

Changed paths:

diff --git a/engines/titanic/npcs/maitre_d.cpp b/engines/titanic/npcs/maitre_d.cpp
index b7634e6..0e2f62c 100644
--- a/engines/titanic/npcs/maitre_d.cpp
+++ b/engines/titanic/npcs/maitre_d.cpp
@@ -116,7 +116,7 @@ bool CMaitreD::EnterViewMsg(CEnterViewMsg *msg) {
 	setTalking(this, true, findView());
 	_fightFlag = _savedFightFlag;
-	if (_musicName == "STMusic" && (!_musicSet || _priorMusicName == _musicName))
+	if (_musicName != "STMusic" && (!_musicSet || _priorMusicName == _musicName))
 		return true;
 	if (_musicName.contains("nasty ambient"))

More information about the Scummvm-git-logs mailing list