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/parallaction.h | |
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/parallaction.h')
-rw-r--r-- | engines/parallaction/parallaction.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index 66a5a12372..11e022c431 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -536,12 +536,15 @@ protected: // members void initGlobals(); void runGame(); + void updateView(); uint32 getElapsedTime(); void resetTimer(); InputData *translateInput(); void processInput(InputData*); + + void scheduleLocationSwitch(const char *location); void doLocationEnterTransition(); virtual void changeLocation(char *location) = 0; virtual void changeCharacter(const char *name) = 0; @@ -904,7 +907,7 @@ protected: DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(move); DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endscript); - void selectCharacterForNewLocation(); + void selectStartLocation(); void guiStart(); int guiSelectCharacter(); @@ -978,7 +981,6 @@ private: const JobFn *_jobsFn; JobOpcode* createJobOpcode(uint functionId, Job *job); - void changeLocation(char *location); void changeCharacter(const char *name); |