diff options
| author | Nicola Mettifogo | 2007-08-12 12:44:26 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-08-12 12:44:26 +0000 |
| commit | ee7102d0e74074895fea85022e0e3fe4eb62d9b2 (patch) | |
| tree | ac79b975e9a6676e83689b56973fbff2cef2305a /engines/parallaction/parallaction.h | |
| parent | 9a9f801e9373429bcbff45a5ca0db4c27cad442e (diff) | |
| download | scummvm-rg350-ee7102d0e74074895fea85022e0e3fe4eb62d9b2.tar.gz scummvm-rg350-ee7102d0e74074895fea85022e0e3fe4eb62d9b2.tar.bz2 scummvm-rg350-ee7102d0e74074895fea85022e0e3fe4eb62d9b2.zip | |
Pushed menu handling into Parallaction_ns.
svn-id: r28556
Diffstat (limited to 'engines/parallaction/parallaction.h')
| -rw-r--r-- | engines/parallaction/parallaction.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index f7f09ce916..e8331ac767 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -301,7 +301,6 @@ public: ~Parallaction(); int init(); - int go(); void loadGame(); void saveGame(); @@ -378,7 +377,6 @@ public: SoundMan *_soundMan; Gfx* _gfx; - Menu* _menu; Disk* _disk; Character _char; @@ -412,8 +410,6 @@ protected: // data Label* _label; }; - bool _skipMenu; - bool _mouseHidden; // input-only @@ -443,7 +439,6 @@ protected: // data protected: // members bool detectGame(void); - void initGame(); void initGlobals(); void runGame(); uint32 getElapsedTime(); @@ -509,6 +504,7 @@ public: ~Parallaction_ns(); int init(); + int go(); public: typedef void (Parallaction_ns::*Callable)(void*); @@ -518,6 +514,9 @@ public: void setMousePointer(int16 index); +public: + Menu* _menu; + private: void initFonts(); void freeFonts(); |