diff options
| author | megamage <none@none> | 2009-01-31 14:41:36 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-31 14:41:36 -0600 |
| commit | 4074b481f0a95bec47d8ce9ed275acf46ff95a8e (patch) | |
| tree | c78273cbaf2fffef0ce54a9d0c1ccefb8871ce70 /src/game/Unit.cpp | |
| parent | d20eaef1d6c7b8d629347b51583cbcf954ff96ed (diff) | |
*Update to Mangos 7206.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 5fd2fa69bc5..8573018ab47 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9064,7 +9064,7 @@ void Unit::SetInCombatWith(Unit* enemy) void Unit::CombatStart(Unit* target) { if(!target->IsStandState()/* && !target->hasUnitState(UNIT_STAT_STUNNED)*/) - target->SetStandState(PLAYER_STATE_NONE); + target->SetStandState(UNIT_STAND_STATE_STAND); if(!target->isInCombat() && target->GetTypeId() != TYPEID_PLAYER && !((Creature*)target)->HasReactState(REACT_PASSIVE) && ((Creature*)target)->AI()) @@ -11214,15 +11214,16 @@ void Unit::SetConfused(bool apply, uint64 casterGUID, uint32 spellID) bool Unit::IsSitState() const { uint8 s = getStandState(); - return s == PLAYER_STATE_SIT_CHAIR || s == PLAYER_STATE_SIT_LOW_CHAIR || - s == PLAYER_STATE_SIT_MEDIUM_CHAIR || s == PLAYER_STATE_SIT_HIGH_CHAIR || - s == PLAYER_STATE_SIT; + return + s == UNIT_STAND_STATE_SIT_CHAIR || s == UNIT_STAND_STATE_SIT_LOW_CHAIR || + s == UNIT_STAND_STATE_SIT_MEDIUM_CHAIR || s == UNIT_STAND_STATE_SIT_HIGH_CHAIR || + s == UNIT_STAND_STATE_SIT; } bool Unit::IsStandState() const { uint8 s = getStandState(); - return !IsSitState() && s != PLAYER_STATE_SLEEP && s != PLAYER_STATE_KNEEL; + return !IsSitState() && s != UNIT_STAND_STATE_SLEEP && s != UNIT_STAND_STATE_KNEEL; } void Unit::SetStandState(uint8 state) |