diff options
author | Matthew Hoops | 2011-09-08 23:04:28 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-09-08 23:04:28 -0400 |
commit | e532af93180c53a80bd4a7e96ab42e7e67e13e97 (patch) | |
tree | 915c6a4ade337dc437e90e370249a5cc113150da /engines/pegasus/pegasus.h | |
parent | 5a7ca3553ca480021c0992e83e9644eeeba2f724 (diff) | |
download | scummvm-rg350-e532af93180c53a80bd4a7e96ab42e7e67e13e97.tar.gz scummvm-rg350-e532af93180c53a80bd4a7e96ab42e7e67e13e97.tar.bz2 scummvm-rg350-e532af93180c53a80bd4a7e96ab42e7e67e13e97.zip |
PEGASUS: Add and hookup the InputHandler class
Diffstat (limited to 'engines/pegasus/pegasus.h')
-rw-r--r-- | engines/pegasus/pegasus.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/pegasus/pegasus.h b/engines/pegasus/pegasus.h index 35ee117ed4..8ab891df9c 100644 --- a/engines/pegasus/pegasus.h +++ b/engines/pegasus/pegasus.h @@ -33,6 +33,7 @@ #include "engines/engine.h" #include "pegasus/graphics.h" +#include "pegasus/input.h" #include "pegasus/video.h" #include "pegasus/neighborhood/neighborhood.h" @@ -64,9 +65,8 @@ enum GameMode { kQuitMode }; -class PegasusEngine : public ::Engine { -protected: - Common::Error run(); +class PegasusEngine : public ::Engine, public InputHandler { +friend class InputHandler; public: PegasusEngine(OSystem *syst, const PegasusGameDescription *gamedesc); @@ -85,6 +85,11 @@ public: void addIdler(Idler *idler); void removeIdler(Idler *idler); +protected: + Common::Error run(); + + Cursor *_cursor; + private: // Intro void runIntro(); @@ -132,7 +137,6 @@ private: // Idlers Common::List<Idler *> _idlers; void giveIdleTime(); - Cursor *_cursor; // Items void createItems(); |