aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/npcs
diff options
context:
space:
mode:
authorPaul Gilbert2017-02-18 16:41:14 -0500
committerPaul Gilbert2017-02-18 16:41:14 -0500
commit7762dae0f9816e3d25efaffe7e2b397e7d8c2bd2 (patch)
treeb479012d46c076041608494624923a1983c3310e /engines/titanic/npcs
parent84866d6f418ba5169d2b85fdbbeba205d6372d00 (diff)
downloadscummvm-rg350-7762dae0f9816e3d25efaffe7e2b397e7d8c2bd2.tar.gz
scummvm-rg350-7762dae0f9816e3d25efaffe7e2b397e7d8c2bd2.tar.bz2
scummvm-rg350-7762dae0f9816e3d25efaffe7e2b397e7d8c2bd2.zip
TITANIC: Fix Maitre'D playing music check
Diffstat (limited to 'engines/titanic/npcs')
-rw-r--r--engines/titanic/npcs/maitre_d.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/titanic/npcs/maitre_d.cpp b/engines/titanic/npcs/maitre_d.cpp
index b7634e682a..0e2f62ccd8 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"))