diff options
| author | Matthew Hoops | 2011-08-15 11:22:26 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-15 11:55:03 -0400 |
| commit | cb43e9694bc2ed8ea19f3d91dd1324670e49314c (patch) | |
| tree | ec108cfa79f27e1022941222d58ec5f08087e1e6 /engines/agi/preagi_mickey.h | |
| parent | fcd0cda9a98de7470f40f1db064ed2cce9f3a86c (diff) | |
| download | scummvm-rg350-cb43e9694bc2ed8ea19f3d91dd1324670e49314c.tar.gz scummvm-rg350-cb43e9694bc2ed8ea19f3d91dd1324670e49314c.tar.bz2 scummvm-rg350-cb43e9694bc2ed8ea19f3d91dd1324670e49314c.zip | |
AGI: Make Mickey inherit from PreAgiEngine
Diffstat (limited to 'engines/agi/preagi_mickey.h')
| -rw-r--r-- | engines/agi/preagi_mickey.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/engines/agi/preagi_mickey.h b/engines/agi/preagi_mickey.h index 62981375c6..788cfab144 100644 --- a/engines/agi/preagi_mickey.h +++ b/engines/agi/preagi_mickey.h @@ -676,13 +676,13 @@ struct MSA_GAME { class PreAgiEngine; -class Mickey { +class MickeyEngine : public PreAgiEngine { public: - Mickey(PreAgiEngine *vm); - ~Mickey(); + MickeyEngine(OSystem *syst, const AGIGameDescription *gameDesc); + ~MickeyEngine(); void init(); - void run(); + Common::Error go(); void debugCurRoom(); void debugGotoRoom(int); @@ -690,9 +690,7 @@ public: void drawObj(ENUM_MSA_OBJECT, int, int); protected: - PreAgiEngine *_vm; - - MSA_GAME _game; + MSA_GAME _gameStateMickey; bool _clickToMove; int getDat(int); @@ -741,14 +739,14 @@ protected: bool planetIsAlreadyAssigned(int planet) { for (int j = 0; j < IDI_MSA_MAX_PLANET; j++) { - if (_game.iPlanetXtal[j] == planet) + if (_gameStateMickey.iPlanetXtal[j] == planet) return true; } return false; } bool mickeyHasItem(int item) { - if (_game.fItem[item]) { + if (_gameStateMickey.fItem[item]) { printDatMessage(90); // Mickey already has item return true; } else { |