diff options
| author | Paul Gilbert | 2011-05-29 21:02:06 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2011-05-30 20:29:13 +1000 |
| commit | ed20f18d29fa6fcfa682c74530515e26a94aef29 (patch) | |
| tree | a7327a98b14fd03a414f4af1e31ce0f8d94c762a /engines/m4/mads_views.h | |
| parent | 7f8a69d6fc44ca5515a91f29ce5451c12f85daa5 (diff) | |
| download | scummvm-rg350-ed20f18d29fa6fcfa682c74530515e26a94aef29.tar.gz scummvm-rg350-ed20f18d29fa6fcfa682c74530515e26a94aef29.tar.bz2 scummvm-rg350-ed20f18d29fa6fcfa682c74530515e26a94aef29.zip | |
TSAGE: General cleanup of object class
Diffstat (limited to 'engines/m4/mads_views.h')
| -rw-r--r-- | engines/m4/mads_views.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/m4/mads_views.h b/engines/m4/mads_views.h index e49c9e6d94..6be2283a32 100644 --- a/engines/m4/mads_views.h +++ b/engines/m4/mads_views.h @@ -34,7 +34,8 @@ namespace M4 { class MadsView; enum MadsActionMode {ACTMODE_NONE = 0, ACTMODE_VERB = 1, ACTMODE_OBJECT = 3, ACTMODE_TALK = 6}; -enum MAdsActionMode2 {ACTMODE2_0 = 0, ACTMODE2_2 = 2, ACTMODE2_4 = 4, ACTMODE2_5 = 5}; +enum MadsActionMode2 {ACTMODE2_0 = 0, ACTMODE2_2 = 2, ACTMODE2_4 = 4, ACTMODE2_5 = 5}; +enum AbortTimerMode {ABORTMODE_0 = 0, ABORTMODE_1 = 1, ABORTMODE_2 = 2}; struct ActionDetails { int verbId; @@ -62,7 +63,7 @@ public: int _currentAction; int8 _flags1, _flags2; MadsActionMode _actionMode; - MAdsActionMode2 _actionMode2; + MadsActionMode2 _actionMode2; int _articleNumber; bool _lookFlag; int _selectedRow; @@ -82,7 +83,7 @@ public: int16 _v86F4C; int _v83338; bool _inProgress; - bool _v8453A; + AbortTimerMode _v8453A; public: MadsAction(MadsView &owner); @@ -96,8 +97,6 @@ public: bool isAction(int verbId, int objectNameId = 0, int indirectObjectId = 0); }; -enum AbortTimerMode {ABORTMODE_0 = 0, ABORTMODE_1 = 1, ABORTMODE_2 = 2}; - class SpriteSlotSubset { public: int spriteListIndex; |