From eed8fc6628b95d642515794a6fce220794f16200 Mon Sep 17 00:00:00 2001 From: Matt Raykowski Date: Fri, 14 May 2010 07:48:23 -0500 Subject: [PATCH] Update: #825 More initialization order issues. --- code/ryzom/common/src/game_share/effect_families.cpp | 6 ++++++ code/ryzom/common/src/game_share/mode_and_behaviour.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/ryzom/common/src/game_share/effect_families.cpp b/code/ryzom/common/src/game_share/effect_families.cpp index 6a6978f83..bc212aa3c 100644 --- a/code/ryzom/common/src/game_share/effect_families.cpp +++ b/code/ryzom/common/src/game_share/effect_families.cpp @@ -214,6 +214,9 @@ namespace EFFECT_FAMILIES case DMGTYPE::POISON : return DebuffResistPoison; case DMGTYPE::ELECTRICITY : return DebuffResistElectricity; case DMGTYPE::SHOCK : return DebuffResistSchock; + default: + return Unknown; + break; } return Unknown; } @@ -229,6 +232,9 @@ namespace EFFECT_FAMILIES case DMGTYPE::POISON : return CombatDoTPoison; case DMGTYPE::ELECTRICITY : return CombatDoTElectricity; case DMGTYPE::SHOCK : return CombatDoTShock; + default: + return Unknown; + break; } return Unknown; } diff --git a/code/ryzom/common/src/game_share/mode_and_behaviour.h b/code/ryzom/common/src/game_share/mode_and_behaviour.h index ff07a69a6..15466fe8a 100644 --- a/code/ryzom/common/src/game_share/mode_and_behaviour.h +++ b/code/ryzom/common/src/game_share/mode_and_behaviour.h @@ -453,7 +453,7 @@ namespace MBEHAV sint16 DeltaHP; uint16 Unused; /// Keep it, used to make the class size = 64 bits (sizeof(CBehaviour) MUST return 8 (bytes)) - inline CBehaviour() : Behaviour(UNKNOWN_BEHAVIOUR), Data(0), Data2(0), DeltaHP(0), Unused(0) {} + inline CBehaviour() : Data(0), Data2(0), Behaviour(UNKNOWN_BEHAVIOUR), DeltaHP(0), Unused(0) {} inline CBehaviour( EBehaviour behaviour ) {