diff options
author | Strangerke | 2017-01-31 18:15:31 +0100 |
---|---|---|
committer | Strangerke | 2017-01-31 18:15:31 +0100 |
commit | f4472d2f0a6f54b7a7b5dacceb069ad983d5e0fd (patch) | |
tree | e6cb3d5e303a32440cc1f6a4395c368c46f03f4f /engines/dm/champion.h | |
parent | 2a74a975a38fa7113b92d98d48ddc03c76437f3c (diff) | |
download | scummvm-rg350-f4472d2f0a6f54b7a7b5dacceb069ad983d5e0fd.tar.gz scummvm-rg350-f4472d2f0a6f54b7a7b5dacceb069ad983d5e0fd.tar.bz2 scummvm-rg350-f4472d2f0a6f54b7a7b5dacceb069ad983d5e0fd.zip |
DM: Fix GCC warnings
Diffstat (limited to 'engines/dm/champion.h')
-rw-r--r-- | engines/dm/champion.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/engines/dm/champion.h b/engines/dm/champion.h index ffcd7abc42..60c45a8825 100644 --- a/engines/dm/champion.h +++ b/engines/dm/champion.h @@ -397,6 +397,9 @@ public: }; // @ SKILL class Champion { +private: + DMEngine *_vm; + public: uint16 _attributes; uint16 _wounds; @@ -428,6 +431,9 @@ public: int16 _shieldDefense; byte _portrait[928]; // 32 x 29 pixel portrait + Champion() {} + void setVm(DMEngine *vm) { _vm = vm; } + Thing &getSlot(ChampionSlot slot) { return _slots[slot]; } void setSlot(ChampionSlot slot, Thing val) { _slots[slot] = val; } @@ -487,7 +493,7 @@ class ChampionMan { public: - Champion _champions[4]; // @ K0071_as_Champions + Champion *_champions; // @ K0071_as_Champions uint16 _partyChampionCount; // @ G0305_ui_PartyChampionCount bool _partyDead; // @ G0303_B_PartyDead Thing _leaderHandObject; // @ G0414_T_LeaderHandObject @@ -502,6 +508,8 @@ public: bool _mousePointerHiddenToDrawChangedObjIconOnScreen; // @ G0420_B_MousePointerHiddenToDrawChangedObjectIconOnScreen explicit ChampionMan(DMEngine *vm); + ~ChampionMan(); + ChampionIndex getIndexInCell(int16 cell); // @ F0285_CHAMPION_GetIndexInCell bool isLeaderHandObjectThrown(int16 side); // @ F0329_CHAMPION_IsLeaderHandObjectThrown bool isObjectThrown(uint16 champIndex, int16 slotIndex, int16 side); // @ F0328_CHAMPION_IsObjectThrown |