aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/gui_br.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2008-08-20 04:02:12 +0000
committerNicola Mettifogo2008-08-20 04:02:12 +0000
commit9549cbee7f325ae18b9c6cb965073e931540ff2e (patch)
tree920cb5f107b7d8b94f67a1ba041866b0bc1eafce /engines/parallaction/gui_br.cpp
parentd5d4500b6450c139c5f219ae2e4cbb892c749bcb (diff)
downloadscummvm-rg350-9549cbee7f325ae18b9c6cb965073e931540ff2e.tar.gz
scummvm-rg350-9549cbee7f325ae18b9c6cb965073e931540ff2e.tar.bz2
scummvm-rg350-9549cbee7f325ae18b9c6cb965073e931540ff2e.zip
Engine now returns to the menu when intro is over.
svn-id: r34047
Diffstat (limited to 'engines/parallaction/gui_br.cpp')
-rw-r--r--engines/parallaction/gui_br.cpp27
1 files changed, 11 insertions, 16 deletions
diff --git a/engines/parallaction/gui_br.cpp b/engines/parallaction/gui_br.cpp
index 3315433762..d2169a9073 100644
--- a/engines/parallaction/gui_br.cpp
+++ b/engines/parallaction/gui_br.cpp
@@ -264,29 +264,24 @@ const MainMenuInputState_BR::MenuOptions MainMenuInputState_BR::_options[NUM_MEN
-void Parallaction_br::startGui() {
+void Parallaction_br::startGui(bool showSplash) {
_menuHelper = new MenuInputHelper;
- new SplashInputState0_BR(this, _menuHelper);
- new SplashInputState1_BR(this, _menuHelper);
- new MainMenuInputState_BR(this, _menuHelper);
-
- _menuHelper->setState("intro0");
- _input->_inputMode = Input::kInputModeMenu;
- do {
- _input->readInput();
- if (!_menuHelper->run()) break;
- _gfx->beginFrame();
- _gfx->updateScreen();
- } while (true);
+ new MainMenuInputState_BR(this, _menuHelper);
- delete _menuHelper;
- _menuHelper = 0;
+ if (showSplash) {
+ new SplashInputState0_BR(this, _menuHelper);
+ new SplashInputState1_BR(this, _menuHelper);
+ _menuHelper->setState("intro0");
+ } else {
+ _menuHelper->setState("mainmenu");
+ }
- _input->_inputMode = Input::kInputModeGame;
+ _input->_inputMode = Input::kInputModeMenu;
}
+
} // namespace Parallaction