diff options
| author | Paul Gilbert | 2010-03-16 08:26:08 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2010-03-16 08:26:08 +0000 |
| commit | 730405f975e05659b5f37ffd5bd8761eb20c7af4 (patch) | |
| tree | 5a1c37e92f20b8c7546f753e8eceaf00eedf130f /engines/m4/mads_scene.h | |
| parent | a1f1cdf820f5eefac4fbcba8a596646fc05b954e (diff) | |
| download | scummvm-rg350-730405f975e05659b5f37ffd5bd8761eb20c7af4.tar.gz scummvm-rg350-730405f975e05659b5f37ffd5bd8761eb20c7af4.tar.bz2 scummvm-rg350-730405f975e05659b5f37ffd5bd8761eb20c7af4.zip | |
Further code implemented for the current action display
svn-id: r48266
Diffstat (limited to 'engines/m4/mads_scene.h')
| -rw-r--r-- | engines/m4/mads_scene.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/engines/m4/mads_scene.h b/engines/m4/mads_scene.h index 82ac4f28ba..2f8fcf990b 100644 --- a/engines/m4/mads_scene.h +++ b/engines/m4/mads_scene.h @@ -124,26 +124,38 @@ public: }; enum MadsActionMode {ACTMODE_NONE = 0, ACTMODE_VERB = 1, ACTMODE_OBJECT = 3, ACTMODE_TALK = 6}; +enum MAdsActionMode2 {ACTMODE2_0 = 0, ACTMODE2_2 = 2, ACTMODE2_5 = 5}; class MadsAction { private: char _statusText[100]; + + void appendVocab(int vocabId, bool capitalise = false); +public: int _currentHotspot; int _objectNameId; int _objectDescId; int _currentAction; int8 _flags1, _flags2; MadsActionMode _actionMode; + MAdsActionMode2 _actionMode2; int _articleNumber; bool _lookFlag; int _selectedRow; + // Unknown fields + int16 _word_86F3A; + int16 _word_86F42; + int16 _word_86F4E; + int16 _word_86F4A; + int16 _word_83334; + int16 _word_86F4C; - void appendVocab(int vocabId, bool capitalise = false); public: MadsAction(); void clear(); void set(); + const char *statusText() const { return _statusText; } }; typedef Common::Array<SpriteAsset *> SpriteAssetArray; @@ -155,7 +167,7 @@ class MadsScene : public Scene { private: MadsEngine *_vm; MadsSceneResources _sceneResources; - char _statusText[100]; + MadsAction _action; MadsSceneLogic _sceneLogic; SpriteAsset *_playerSprites; @@ -187,7 +199,6 @@ public: virtual void leftClick(int x, int y); virtual void rightClick(int x, int y); virtual void setAction(int action, int objectId = -1); - virtual void setStatusText(const char *text); virtual void update(); int loadSceneSpriteSet(const char *setName); @@ -196,6 +207,7 @@ public: MadsInterfaceView *getInterface() { return (MadsInterfaceView *)_interfaceSurface; }; MadsSceneResources &getSceneResources() { return _sceneResources; }; + void setStatusText(const char *text) {};//***DEPRECATED*** }; } // End of namespace M4 |