diff options
| author | Christopher Page | 2008-06-02 21:08:49 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-06-02 21:08:49 +0000 |
| commit | a338d5fdb2715a7b29ae789c632a0cfa05803079 (patch) | |
| tree | b80b3e278050d5027dddd2723cf60b5108893f08 /engines/parallaction/parallaction_ns.cpp | |
| parent | 203f62ad7cfc3f931c98c8fc3ecdbb01924b896f (diff) | |
| download | scummvm-rg350-a338d5fdb2715a7b29ae789c632a0cfa05803079.tar.gz scummvm-rg350-a338d5fdb2715a7b29ae789c632a0cfa05803079.tar.bz2 scummvm-rg350-a338d5fdb2715a7b29ae789c632a0cfa05803079.zip | |
PARA: Got rid of calls to system->quit() so that the Parallaction engine can return to the launcher. Also fixed a couple of memory leaks.
svn-id: r32504
Diffstat (limited to 'engines/parallaction/parallaction_ns.cpp')
| -rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index 8e0f83d46d..8254a85a34 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -241,9 +241,15 @@ int Parallaction_ns::go() { _globalTable = _disk->loadTable("global"); guiStart(); - + + if (_engineFlags & kEngineQuit) + return 0; + changeLocation(_location._name); + if (_engineFlags & kEngineQuit) + return 0; + _input->_inputMode = Input::kInputModeGame; while ((_engineFlags & kEngineQuit) == 0) { runGame(); |