diff options
author | Willem Jan Palenstijn | 2015-07-22 22:37:40 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-07-22 22:43:42 +0200 |
commit | 6ec9c81b575f13b2c4b30aeac592ebf2557b5890 (patch) | |
tree | 503d50902bad2d800165593039d08d5ccf0c98ab /engines/saga/introproc_ihnm.cpp | |
parent | 5ec05f6b647c5ea41418be7ed19ad381f97cabd8 (diff) | |
parent | 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73 (diff) | |
download | scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.gz scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.bz2 scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.zip |
Merge branch 'master' into mm
Conflicts:
engines/access/access.cpp
engines/access/asurface.h
engines/access/bubble_box.cpp
engines/access/bubble_box.h
engines/access/martian/martian_game.cpp
engines/access/player.cpp
engines/access/player.h
engines/access/resources.cpp
engines/access/screen.cpp
engines/access/screen.h
engines/access/sound.cpp
engines/access/sound.h
Diffstat (limited to 'engines/saga/introproc_ihnm.cpp')
-rw-r--r-- | engines/saga/introproc_ihnm.cpp | 4 |
1 files changed, 2 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; |