diff options
author | Julien Templier | 2010-10-27 19:19:57 +0000 |
---|---|---|
committer | Julien Templier | 2010-10-27 19:19:57 +0000 |
commit | 5688a393b420a8f3ba83444c44bebcff47c7339a (patch) | |
tree | aea99463e17e53408208f43ed239cf6546391eb7 /engines | |
parent | d5e4ab6b209b1e2a847993ce40a4c015e795b168 (diff) | |
download | scummvm-rg350-5688a393b420a8f3ba83444c44bebcff47c7339a.tar.gz scummvm-rg350-5688a393b420a8f3ba83444c44bebcff47c7339a.tar.bz2 scummvm-rg350-5688a393b420a8f3ba83444c44bebcff47c7339a.zip |
LASTEXPRESS: Do not try to show intro when loading a game
svn-id: r53882
Diffstat (limited to 'engines')
-rw-r--r-- | engines/lastexpress/game/menu.cpp | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/engines/lastexpress/game/menu.cpp b/engines/lastexpress/game/menu.cpp index 537162e6bf..1bdb9ac5ac 100644 --- a/engines/lastexpress/game/menu.cpp +++ b/engines/lastexpress/game/menu.cpp @@ -692,35 +692,37 @@ bool Menu::handleEvent(StartMenuAction action, Common::EventType type) { getSavePoints()->reset(); setLogicEventHandlers(); - getSound()->processEntry(SoundManager::kSoundType11); - - if (!getFlags()->mouseRightClick) { - getScenes()->loadScene((SceneIndex)(5 * _gameId + 3)); - + if (_index) { + getSound()->processEntry(SoundManager::kSoundType11); + } else { if (!getFlags()->mouseRightClick) { - getScenes()->loadScene((SceneIndex)(5 * _gameId + 4)); + getScenes()->loadScene((SceneIndex)(5 * _gameId + 3)); if (!getFlags()->mouseRightClick) { - getScenes()->loadScene((SceneIndex)(5 * _gameId + 5)); + getScenes()->loadScene((SceneIndex)(5 * _gameId + 4)); if (!getFlags()->mouseRightClick) { - getSound()->processEntry(SoundManager::kSoundType11); + getScenes()->loadScene((SceneIndex)(5 * _gameId + 5)); + + if (!getFlags()->mouseRightClick) { + getSound()->processEntry(SoundManager::kSoundType11); - // Show intro - Animation animation; - if (animation.load(getArchive("1601.nis"))) - animation.play(); + // Show intro + Animation animation; + if (animation.load(getArchive("1601.nis"))) + animation.play(); - getEvent(kEventIntro) = 1; + getEvent(kEventIntro) = 1; + } } } } - } - if (!getEvent(kEventIntro)) { - getEvent(kEventIntro) = 1; + if (!getEvent(kEventIntro)) { + getEvent(kEventIntro) = 1; - getSound()->processEntry(SoundManager::kSoundType11); + getSound()->processEntry(SoundManager::kSoundType11); + } } // Setup game |