aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/parallaction_ns.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2008-07-24 09:24:32 +0000
committerNicola Mettifogo2008-07-24 09:24:32 +0000
commit4936e5f7df8e2257b1af4ee3ab2fdcd8cb88e91b (patch)
tree80b4cb2cc25b29421920f062c39de6752ae63646 /engines/parallaction/parallaction_ns.cpp
parent69dac1d4f22f9a63a5a9030d4405ba071e5e8b89 (diff)
downloadscummvm-rg350-4936e5f7df8e2257b1af4ee3ab2fdcd8cb88e91b.tar.gz
scummvm-rg350-4936e5f7df8e2257b1af4ee3ab2fdcd8cb88e91b.tar.bz2
scummvm-rg350-4936e5f7df8e2257b1af4ee3ab2fdcd8cb88e91b.zip
* Moved end intro and end game sequences code to gui.
* Rewrote all gui code to be run inside the main loop * Added code to avoid crashes when a scene with no standard background is drawn svn-id: r33260
Diffstat (limited to 'engines/parallaction/parallaction_ns.cpp')
-rw-r--r--engines/parallaction/parallaction_ns.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index b2e60c5851..cf5cf2cd73 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -240,17 +240,8 @@ int Parallaction_ns::go() {
_globalTable = _disk->loadTable("global");
- guiStart();
+ startGui();
- if (_engineFlags & kEngineQuit)
- return 0;
-
- changeLocation(_location._name);
-
- if (_engineFlags & kEngineQuit)
- return 0;
-
- _input->_inputMode = Input::kInputModeGame;
while ((_engineFlags & kEngineQuit) == 0) {
runGame();
}