aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/champion.cpp
diff options
context:
space:
mode:
authorBendegúz Nagy2016-08-26 22:50:01 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commit723c96fffe2d0eb1775983f3059828ac58354a0e (patch)
tree76bd263b2fbb2b61db9675a60ac3759e6fc2bb52 /engines/dm/champion.cpp
parente02d165fceedec6aff32cc9529b72b07cf8d103a (diff)
downloadscummvm-rg350-723c96fffe2d0eb1775983f3059828ac58354a0e.tar.gz
scummvm-rg350-723c96fffe2d0eb1775983f3059828ac58354a0e.tar.bz2
scummvm-rg350-723c96fffe2d0eb1775983f3059828ac58354a0e.zip
DM: Clean up some initialization
Diffstat (limited to 'engines/dm/champion.cpp')
-rw-r--r--engines/dm/champion.cpp20
1 files changed, 12 insertions, 8 deletions
diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp
index 5c1f5466a7..644914081e 100644
--- a/engines/dm/champion.cpp
+++ b/engines/dm/champion.cpp
@@ -96,18 +96,22 @@ uint16 gSlotMasks[38] = { // @ G0038_ai_Graphic562_SlotMasks
Box gBoxChampionPortrait = Box(0, 31, 0, 28); // @ G0047_s_Graphic562_Box_ChampionPortrait
ChampionMan::ChampionMan(DMEngine *vm) : _vm(vm) {
- _g411_leaderIndex = kM1_ChampionNone;
-
- _g303_partyDead = false;
- _g300_partyIsSleeping = false;
- _g413_leaderHandObjectIconIndex = kM1_IconIndiceNone;
- _g415_leaderEmptyHanded = true;
- _g514_magicCasterChampionIndex = kM1_ChampionNone;
for (uint16 i = 0; i < 4; ++i) {
_g409_championPendingDamage[i] = 0;
_g410_championPendingWounds[i] = 0;
+ _gK71_champions[i].resetToZero();
}
-
+ _g305_partyChampionCount = 0;
+ _g303_partyDead = false;
+ _g414_leaderHandObject = Thing(0);
+ _g411_leaderIndex = kM1_ChampionNone;
+ _g300_partyIsSleeping = false;
+ _g506_actingChampionOrdinal = 0;
+ _g413_leaderHandObjectIconIndex = (IconIndice)0;
+ _g415_leaderEmptyHanded = false;
+ _g407_party.resetToZero();
+ _g514_magicCasterChampionIndex = kM1_ChampionNone;
+ _g420_mousePointerHiddenToDrawChangedObjIconOnScreen = false;
}
bool ChampionMan::f329_isLeaderHandObjectThrown(int16 side) {