diff options
| -rw-r--r-- | queen/music.cpp | 9 | ||||
| -rw-r--r-- | queen/sound.cpp | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/queen/music.cpp b/queen/music.cpp index ac4b407200..1d399959a6 100644 --- a/queen/music.cpp +++ b/queen/music.cpp @@ -38,8 +38,13 @@ namespace Queen { _midi->setTimerRate(_driver->getBaseTempo()); _driver->setTimerCallback(this, myTimerProc); - _musicData = vm->resource()->loadFile("AQ.RL", 0, NULL); - _musicDataSize = vm->resource()->fileSize("AQ.RL"); + if (vm->resource()->isDemo()) { + _musicData = vm->resource()->loadFile("AQ8.RL", 0, NULL); + _musicDataSize = vm->resource()->fileSize("AQ8.RL"); + } else { + _musicData = vm->resource()->loadFile("AQ.RL", 0, NULL); + _musicDataSize = vm->resource()->fileSize("AQ.RL"); + } _numSongs = READ_LE_UINT16(_musicData); } diff --git a/queen/sound.cpp b/queen/sound.cpp index 67edeafa14..06a506f25b 100644 --- a/queen/sound.cpp +++ b/queen/sound.cpp @@ -107,7 +107,7 @@ void Sound::playSong(int16 songNum) { return; } - if (!musicOn()) + if (!musicOn() || _vm->resource()->isDemo()) return; _lastOverride = songNum; |