diff options
| -rw-r--r-- | engines/titanic/npcs/maitre_d.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/titanic/npcs/maitre_d.cpp b/engines/titanic/npcs/maitre_d.cpp index 0e2f62ccd8..6ac69d9079 100644 --- a/engines/titanic/npcs/maitre_d.cpp +++ b/engines/titanic/npcs/maitre_d.cpp @@ -119,6 +119,11 @@ bool CMaitreD::EnterViewMsg(CEnterViewMsg *msg) { if (_musicName != "STMusic" && (!_musicSet || _priorMusicName == _musicName)) return true; + // WORKAROUND: It's possible in the original to not have a music handler set + // if you start and stop the phonograph, then save and restore the game + if (!CMusicRoom::_musicHandler) + return true; + if (_musicName.contains("nasty ambient")) startTalking(this, 111, findView()); else if (!CMusicRoom::_musicHandler->checkInstrument(SNAKE)) |