diff options
| author | Nicola Mettifogo | 2007-11-14 22:24:26 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-11-14 22:24:26 +0000 |
| commit | 10caba35628d148cc9539d72d08ca38915484d0e (patch) | |
| tree | b71d2fdd89923a172a46a1ba17798cfabf5ad85e /engines/parallaction/callables_ns.cpp | |
| parent | 193e59151ceef423633214c6d744c87282c7d02b (diff) | |
| download | scummvm-rg350-10caba35628d148cc9539d72d08ca38915484d0e.tar.gz scummvm-rg350-10caba35628d148cc9539d72d08ca38915484d0e.tar.bz2 scummvm-rg350-10caba35628d148cc9539d72d08ca38915484d0e.zip | |
* centralized kEngineChangeLocation flag handling
* simplified runGame, moving flags testing into called routines
svn-id: r29504
Diffstat (limited to 'engines/parallaction/callables_ns.cpp')
| -rw-r--r-- | engines/parallaction/callables_ns.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/engines/parallaction/callables_ns.cpp b/engines/parallaction/callables_ns.cpp index 1437c68f42..c894c45a6f 100644 --- a/engines/parallaction/callables_ns.cpp +++ b/engines/parallaction/callables_ns.cpp @@ -424,9 +424,7 @@ void Parallaction_ns::_c_finito(void *parm) { _gfx->updateScreen(); waitUntilLeftClick(); - strcpy(_location._name, "estgrotta.drki"); - - _engineFlags |= kEngineChangeLocation; + scheduleLocationSwitch("estgrotta.drki"); } else { _gfx->setFont(_menuFont); _gfx->displayCenteredString(70, v8C[_language]); @@ -437,8 +435,7 @@ void Parallaction_ns::_c_finito(void *parm) { _gfx->updateScreen(); waitUntilLeftClick(); - selectCharacterForNewLocation(); - _engineFlags |= kEngineChangeLocation; + selectStartLocation(); } cleanupGame(); @@ -534,8 +531,7 @@ void Parallaction_ns::_c_endIntro(void *parm) { waitUntilLeftClick(); _engineFlags &= ~kEngineBlockInput; - selectCharacterForNewLocation(); - _engineFlags |= kEngineChangeLocation; + selectStartLocation(); cleanupGame(); |