diff options
| author | Brian <runningnak3d@gmail.com> | 2010-01-07 22:49:06 -0700 |
|---|---|---|
| committer | Brian <runningnak3d@gmail.com> | 2010-01-07 22:49:06 -0700 |
| commit | fd26ad5611250be00ee8132260b640e60261308d (patch) | |
| tree | 8332d70d154478994ca0bd3d07583a010b23f177 /src | |
| parent | f91b28973343a0f76048e1ffb901b50ab318b643 (diff) | |
* Hopefully fix creature so they swim if InhabitType|2
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Creature.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 9fcd1cd48ac..4bcf866632c 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -416,7 +416,10 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data ) } if(GetCreatureInfo()->InhabitType & INHABIT_AIR) - AddUnitMovementFlag(MOVEMENTFLAG_FLY_MODE + MOVEMENTFLAG_FLYING); + AddUnitMovementFlag(MOVEMENTFLAG_FLY_MODE | MOVEMENTFLAG_FLYING); + + if(GetCreatureInfo()->InhabitType & INHABIT_WATER) + AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING); return true; } @@ -1456,7 +1459,9 @@ void Creature::setDeathState(DeathState s) CreatureInfo const *cinfo = GetCreatureInfo(); AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); if(GetCreatureInfo()->InhabitType & INHABIT_AIR) - AddUnitMovementFlag(MOVEMENTFLAG_FLY_MODE + MOVEMENTFLAG_FLYING); + AddUnitMovementFlag(MOVEMENTFLAG_FLY_MODE | MOVEMENTFLAG_FLYING); + if(GetCreatureInfo()->InhabitType & INHABIT_WATER) + AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING); SetUInt32Value(UNIT_NPC_FLAGS, cinfo->npcflag); clearUnitState(UNIT_STAT_ALL_STATE); SetMeleeDamageSchool(SpellSchools(cinfo->dmgschool)); |