aboutsummaryrefslogtreecommitdiff
path: root/saga/scene.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-10-06 15:54:43 +0000
committerTorbjörn Andersson2005-10-06 15:54:43 +0000
commit92f5e206bd0c4d668d3a6187efb26a75ec99e81b (patch)
treef4e046e2d0a933d0b10e58d3f3071f1003fea2d8 /saga/scene.cpp
parent36295605ab706f70e1b773de14242839889b0a81 (diff)
downloadscummvm-rg350-92f5e206bd0c4d668d3a6187efb26a75ec99e81b.tar.gz
scummvm-rg350-92f5e206bd0c4d668d3a6187efb26a75ec99e81b.tar.bz2
scummvm-rg350-92f5e206bd0c4d668d3a6187efb26a75ec99e81b.zip
Disabled scene background music for IHNM, for now. It was trying to start
the end credits music right after the intro. svn-id: r18950
Diffstat (limited to 'saga/scene.cpp')
-rw-r--r--saga/scene.cpp38
1 files changed, 22 insertions, 16 deletions
diff --git a/saga/scene.cpp b/saga/scene.cpp
index dd58ba67cb..ac40c69348 100644
--- a/saga/scene.cpp
+++ b/saga/scene.cpp
@@ -799,7 +799,6 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) {
q_event = _vm->_events->chain(q_event, &event);
}
-
if (loadSceneParams->sceneProc == NULL) {
if (!_inGame) {
_inGame = true;
@@ -808,22 +807,29 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) {
_vm->_sound->stopAll();
- if (_sceneDescription.musicResourceId >= 0) {
- event.type = kEvTOneshot;
- event.code = kMusicEvent;
- event.param = _sceneDescription.musicResourceId;
- event.param2 = MUSIC_DEFAULT;
- event.op = kEventPlay;
- event.time = 0;
-
- _vm->_events->queue(&event);
- } else {
- event.type = kEvTOneshot;
- event.code = kMusicEvent;
- event.op = kEventStop;
- event.time = 0;
+ // FIXME: Does IHNM use scene background music, or is all the
+ // music scripted? At the very least, it shouldn't try
+ // to start song 0 at the beginning of the game, since
+ // it's the end credits music.
+
+ if (_vm->getGameType() == GType_ITE) {
+ if (_sceneDescription.musicResourceId >= 0) {
+ event.type = kEvTOneshot;
+ event.code = kMusicEvent;
+ event.param = _sceneDescription.musicResourceId;
+ event.param2 = MUSIC_DEFAULT;
+ event.op = kEventPlay;
+ event.time = 0;
+
+ _vm->_events->queue(&event);
+ } else {
+ event.type = kEvTOneshot;
+ event.code = kMusicEvent;
+ event.op = kEventStop;
+ event.time = 0;
- _vm->_events->queue(&event);
+ _vm->_events->queue(&event);
+ }
}
// Set scene background