aboutsummaryrefslogtreecommitdiff
path: root/engines/saga
diff options
context:
space:
mode:
authorTorbjörn Andersson2015-06-28 16:38:47 +0200
committerTorbjörn Andersson2015-06-28 16:38:47 +0200
commit7615f926d55cb7c9bf08d72be69f66f0d88479b6 (patch)
treee63a8a0927c169dd568a66ecb1d35275a688ce39 /engines/saga
parenta1929c688717beaf3babb73f309b8f32db49f919 (diff)
downloadscummvm-rg350-7615f926d55cb7c9bf08d72be69f66f0d88479b6.tar.gz
scummvm-rg350-7615f926d55cb7c9bf08d72be69f66f0d88479b6.tar.bz2
scummvm-rg350-7615f926d55cb7c9bf08d72be69f66f0d88479b6.zip
SAGA: Tweak music timing in IHNM intro
This wasn't a regression. The music has always been cut off at an awkward point.
Diffstat (limited to 'engines/saga')
-rw-r--r--engines/saga/introproc_ihnm.cpp4
-rw-r--r--engines/saga/music.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/saga/introproc_ihnm.cpp b/engines/saga/introproc_ihnm.cpp
index fc28d2372f..dc3f55e8c1 100644
--- a/engines/saga/introproc_ihnm.cpp
+++ b/engines/saga/introproc_ihnm.cpp
@@ -68,7 +68,7 @@ int Scene::IHNMStartProc() {
// Play the title music
_vm->_music->play(1, MUSIC_NORMAL);
// Play title screen
- playTitle(2, 17);
+ playTitle(2, _vm->_music->isAdlib() ? 20 : 27);
}
}
} else {
@@ -150,7 +150,7 @@ bool Scene::checkKey() {
break;
case Common::EVENT_KEYDOWN:
// Don't react to modifier keys alone. The original did
- // non, and the user may want to change scaler without
+ // not, and the user may want to change scaler without
// terminating the intro.
if (event.kbd.ascii)
res = true;
diff --git a/engines/saga/music.h b/engines/saga/music.h
index c6664f76ee..2e7cc4c5ec 100644
--- a/engines/saga/music.h
+++ b/engines/saga/music.h
@@ -80,6 +80,8 @@ public:
void setVolume(int volume, int time = 1);
int getVolume() { return _currentVolume; }
+ bool isAdlib() const { return _player->isAdlib(); }
+
Common::Array<int32> _songTable;
private: