diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp index e09fc962a..1728d1009 100644 --- a/src/game/MotionMaster.cpp +++ b/src/game/MotionMaster.cpp @@ -45,7 +45,7 @@ MotionMaster::Initialize() Clear(false,true); // set new default movement generator - if (i_owner->GetTypeId() == TYPEID_UNIT && !i_owner->hasUnitState(UNIT_STAT_CONTROLED)) + if (i_owner->GetTypeId() == TYPEID_UNIT && !i_owner->hasUnitState(UNIT_STAT_CONTROLLED)) { MovementGenerator* movement = FactorySelector::selectMovementGenerator((Creature*)i_owner); push(movement == NULL ? &si_idleMovement : movement); diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 027037a4e..c99639ee2 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -3619,7 +3619,7 @@ void Aura::HandleModPossess(bool apply, bool Real) if( apply ) { - target->addUnitState(UNIT_STAT_CONTROLED); + target->addUnitState(UNIT_STAT_CONTROLLED); target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED); @@ -3670,7 +3670,7 @@ void Aura::HandleModPossess(bool apply, bool Real) if(m_removeMode == AURA_REMOVE_BY_DELETE) return; - target->clearUnitState(UNIT_STAT_CONTROLED); + target->clearUnitState(UNIT_STAT_CONTROLLED); target->CombatStop(true); target->DeleteThreatList(); diff --git a/src/game/Unit.h b/src/game/Unit.h index 11090bf49..d02235dd6 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -420,7 +420,7 @@ enum UnitState UNIT_STAT_STUNNED = 0x00000008, // Aura::HandleAuraModStun UNIT_STAT_ROOT = 0x00000010, // Aura::HandleAuraModRoot UNIT_STAT_ISOLATED = 0x00000020, // area auras do not affect other players, Aura::HandleAuraModSchoolImmunity - UNIT_STAT_CONTROLED = 0x00000040, // Aura::HandleAuraModPossess + UNIT_STAT_CONTROLLED = 0x00000040, // Aura::HandleAuraModPossess // persistent movement generator state (all time while movement generator applied to unit (independent from top state of movegen) UNIT_STAT_IN_FLIGHT = 0x00000080, // player is in flight mode (in fact interrupted at far teleport until next map telport landing) @@ -459,7 +459,7 @@ enum UnitState UNIT_STAT_CONFUSED | UNIT_STAT_FLEEING, // AI disabled by some reason - UNIT_STAT_LOST_CONTROL = UNIT_STAT_FLEEING | UNIT_STAT_CONTROLED, + UNIT_STAT_LOST_CONTROL = UNIT_STAT_FLEEING | UNIT_STAT_CONTROLLED, // above 2 state cases UNIT_STAT_CAN_NOT_REACT_OR_LOST_CONTROL = UNIT_STAT_CAN_NOT_REACT | UNIT_STAT_LOST_CONTROL, diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 982dcef41..3d4a5ca55 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10056" + #define REVISION_NR "10057" #endif // __REVISION_NR_H__