diff options
| author | Nicola Mettifogo | 2008-09-02 01:58:55 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2008-09-02 01:58:55 +0000 |
| commit | 4ab5d3fdc4c6692c48a3c01d26fffa5bd8f5c335 (patch) | |
| tree | c154a67d24649af51b89e50779a2a97f4d953576 /engines/parallaction/parallaction_ns.cpp | |
| parent | 3fef592c205a07a7519132ea2fe602340d18eeed (diff) | |
| parent | 852bc9dbb750b9995d31e70f4158c97d3758c46f (diff) | |
| download | scummvm-rg350-4ab5d3fdc4c6692c48a3c01d26fffa5bd8f5c335.tar.gz scummvm-rg350-4ab5d3fdc4c6692c48a3c01d26fffa5bd8f5c335.tar.bz2 scummvm-rg350-4ab5d3fdc4c6692c48a3c01d26fffa5bd8f5c335.zip | |
Merging more of the GSoC 2008 RTL branch: PARALLACTION
svn-id: r34268
Diffstat (limited to 'engines/parallaction/parallaction_ns.cpp')
| -rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index 85a4689301..e0c86a4e37 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -231,11 +231,11 @@ int Parallaction_ns::go() { startGui(); - while ((_engineFlags & kEngineQuit) == 0) { + while (!quit()) { runGame(); } - return 0; + return _eventMan->shouldRTL(); } void Parallaction_ns::switchBackground(const char* background, const char* mask) { @@ -440,13 +440,13 @@ void Parallaction_ns::cleanupGame() { memset(_locationNames, 0, sizeof(_locationNames)); // this flag tells freeZones to unconditionally remove *all* Zones - _engineFlags |= kEngineQuit; + _vm->_quit = true; freeZones(); freeAnimations(); // this dangerous flag can now be cleared - _engineFlags &= ~kEngineQuit; + _vm->_quit = false; // main character animation is restored _location._animations.push_front(_char._ani); |