diff options
| author | Strangerke | 2016-08-22 23:24:49 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | fecb869af99927326b6cb6689c0e8e6d499a5977 (patch) | |
| tree | 553ff1dbe6fe57c7e178c863869528fc9df8455b /engines/dm/menus.h | |
| parent | 2bdabc3b7afe9ba857bfc2be7ac638a566d09bf4 (diff) | |
| download | scummvm-rg350-fecb869af99927326b6cb6689c0e8e6d499a5977.tar.gz scummvm-rg350-fecb869af99927326b6cb6689c0e8e6d499a5977.tar.bz2 scummvm-rg350-fecb869af99927326b6cb6689c0e8e6d499a5977.zip | |
DM: Fix some more GCC warnings, move some globals to MenuMan
Diffstat (limited to 'engines/dm/menus.h')
| -rw-r--r-- | engines/dm/menus.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/engines/dm/menus.h b/engines/dm/menus.h index 40bcfbf689..34f8355251 100644 --- a/engines/dm/menus.h +++ b/engines/dm/menus.h @@ -39,9 +39,6 @@ namespace DM { #define k0x8000_hitNonMaterialCreatures 0x8000 // @ MASK0x8000_HIT_NON_MATERIAL_CREATURES -extern Box g1_BoxActionArea; // @ G0001_s_Graphic562_Box_ActionArea -extern Box g0_BoxSpellArea; // @ G0000_s_Graphic562_Box_SpellArea - class ActionList { public: byte _minimumSkillLevel[3]; /* Bit 7: requires charge, Bit 6-0: minimum skill level. */ @@ -118,6 +115,15 @@ public: void f383_setActionList(ActionSet *actionSet); // @ F0383_MENUS_SetActionList int16 f382_getActionObjectChargeCount(); // @ F0382_MENUS_GetActionObjectChargeCount void f385_drawActionDamage(int16 damage); // @ F0385_MENUS_DrawActionDamage + + Box boxActionArea3ActionMenu; // @ G0499_s_Graphic560_Box_ActionArea3ActionsMenu + Box boxActionArea2ActionMenu; // @ G0500_s_Graphic560_Box_ActionArea2ActionsMenu + Box boxActionArea1ActionMenu; // @ G0501_s_Graphic560_Box_ActionArea1ActionMenu + Box boxActionArea; // @ G0001_s_Graphic562_Box_ActionArea + Box boxSpellArea; + unsigned char g496_ActionSkillIndex[44]; // @ G0496_auc_Graphic560_ActionSkillIndex + + void initConstants(); }; } |