aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/parallaction_ns.cpp
diff options
context:
space:
mode:
authorChristopher Page2008-08-16 04:15:11 +0000
committerChristopher Page2008-08-16 04:15:11 +0000
commitc22f9b23588121d41fe0a12ce44926d683d7a18d (patch)
tree789fb2373e69e068dacd7494d393fe81dcbb1e3d /engines/parallaction/parallaction_ns.cpp
parent20f0bb7a40776f4ed64de29898c3939f1c13a8ba (diff)
downloadscummvm-rg350-c22f9b23588121d41fe0a12ce44926d683d7a18d.tar.gz
scummvm-rg350-c22f9b23588121d41fe0a12ce44926d683d7a18d.tar.bz2
scummvm-rg350-c22f9b23588121d41fe0a12ce44926d683d7a18d.zip
Fixes for Parallaction loading from launcher
svn-id: r33923
Diffstat (limited to 'engines/parallaction/parallaction_ns.cpp')
-rw-r--r--engines/parallaction/parallaction_ns.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index 076df92085..f3c2656001 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -29,6 +29,7 @@
#include "parallaction/parallaction.h"
#include "parallaction/gui.h"
+#include "parallaction/gui_ns.cpp"
#include "parallaction/input.h"
#include "parallaction/sound.h"
@@ -220,7 +221,7 @@ int Parallaction_ns::go() {
renameOldSavefiles();
_globalTable = _disk->loadTable("global");
-/*
+
// If requested, load a savegame instead of showing the intro
if (ConfMan.hasKey("save_slot")) {
_gameToLoad = ConfMan.getInt("save_slot");
@@ -234,13 +235,13 @@ int Parallaction_ns::go() {
_menuHelper = new MenuInputHelper;
assert(_menuHelper);
-
new ChooseLanguageInputState_NS(this, _menuHelper);
+ _menuHelper->setState("chooselanguage");
+
+ _input->_inputMode = Input::kInputModeMenu;
doLoadGame(_gameToLoad);
}
-*/
- startGui();
-
+
while (!quit()) {
runGame();
}