Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Update: #825 More initialization order issues.

Browse source
This commit is contained in:
Matt Raykowski 2010-05-14 07:48:23 -05:00
parent 22fc0c3447
commit 2742738c4b
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/common/src/game_share/effect_families.cpp
View file

@ -214,6 +214,9 @@ namespace EFFECT_FAMILIES
case DMGTYPE::POISON : return DebuffResistPoison; case DMGTYPE::POISON : return DebuffResistPoison;
case DMGTYPE::ELECTRICITY : return DebuffResistElectricity; case DMGTYPE::ELECTRICITY : return DebuffResistElectricity;
case DMGTYPE::SHOCK : return DebuffResistSchock; case DMGTYPE::SHOCK : return DebuffResistSchock;
default:
return Unknown;
break;
} }
return Unknown; return Unknown;
} }
@ -229,6 +232,9 @@ namespace EFFECT_FAMILIES
case DMGTYPE::POISON : return CombatDoTPoison; case DMGTYPE::POISON : return CombatDoTPoison;
case DMGTYPE::ELECTRICITY : return CombatDoTElectricity; case DMGTYPE::ELECTRICITY : return CombatDoTElectricity;
case DMGTYPE::SHOCK : return CombatDoTShock; case DMGTYPE::SHOCK : return CombatDoTShock;
default:
return Unknown;
break;
} }
return Unknown; return Unknown;
} }

2
code/ryzom/common/src/game_share/mode_and_behaviour.h
View file

@ -453,7 +453,7 @@ namespace MBEHAV
sint16 DeltaHP; sint16 DeltaHP;
uint16 Unused; /// Keep it, used to make the class size = 64 bits (sizeof(CBehaviour) MUST return 8 (bytes)) 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 ) inline CBehaviour( EBehaviour behaviour )
{ {