aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2014-05-12 20:21:33 -0400
committerPaul Gilbert2014-05-12 20:21:33 -0400
commit59da02fa9a1922d6c7b47ba128c86a37ada66e48 (patch)
tree048c69e7890999e60bbce511225b2975dffb092a /engines
parent85c311059c3fe562b688765820066825a47d2f10 (diff)
downloadscummvm-rg350-59da02fa9a1922d6c7b47ba128c86a37ada66e48.tar.gz
scummvm-rg350-59da02fa9a1922d6c7b47ba128c86a37ada66e48.tar.bz2
scummvm-rg350-59da02fa9a1922d6c7b47ba128c86a37ada66e48.zip
MADS: Hook in the section 1 sound player
Diffstat (limited to 'engines')
-rw-r--r--engines/mads/game.cpp1
-rw-r--r--engines/mads/sound.cpp10
2 files changed, 9 insertions, 2 deletions
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 3f6c8e09d5..34b229f157 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -161,6 +161,7 @@ void Game::gameLoop() {
setSectionHandler();
_sectionHandler->preLoadSection();
initSection(_sectionNumber);
+ _vm->_sound->init(_sectionNumber);
_sectionHandler->postLoadSection();
_scene._spriteSlots.reset();
diff --git a/engines/mads/sound.cpp b/engines/mads/sound.cpp
index eaac70c670..d46516d10e 100644
--- a/engines/mads/sound.cpp
+++ b/engines/mads/sound.cpp
@@ -48,8 +48,14 @@ void SoundManager::init(int sectionNumber) {
switch (_vm->getGameID()) {
case GType_RexNebular:
// TODO: Other Rex Adlib section drivers
- assert(sectionNumber == 1);
- _driver = new Nebular::ASound1(_mixer);
+ switch (sectionNumber) {
+ case 1:
+ _driver = new Nebular::ASound1(_mixer);
+ break;
+ default:
+ _driver = nullptr;
+ break;
+ }
break;
default: