mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 07:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10057] Type in UNIT_STAT_CONTROLLED

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
zergtmn 2010-06-14 22:07:10 +04:00 • committed by VladimirMangos
parent aa5dfc2895
commit e34315f23f
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/MotionMaster.cpp
View file

@ -45,7 +45,7 @@ MotionMaster::Initialize()
Clear(false,true); Clear(false,true);
// set new default movement generator // 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); MovementGenerator* movement = FactorySelector::selectMovementGenerator((Creature*)i_owner);
push(movement == NULL ? &si_idleMovement : movement); push(movement == NULL ? &si_idleMovement : movement);

4
src/game/SpellAuras.cpp
View file

@ -3619,7 +3619,7 @@ void Aura::HandleModPossess(bool apply, bool Real)
if( apply ) if( apply )
{ {
target->addUnitState(UNIT_STAT_CONTROLED); target->addUnitState(UNIT_STAT_CONTROLLED);
target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_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) if(m_removeMode == AURA_REMOVE_BY_DELETE)
return; return;
target->clearUnitState(UNIT_STAT_CONTROLED); target->clearUnitState(UNIT_STAT_CONTROLLED);
target->CombatStop(true); target->CombatStop(true);
target->DeleteThreatList(); target->DeleteThreatList();

4
src/game/Unit.h
View file

@ -420,7 +420,7 @@ enum UnitState
UNIT_STAT_STUNNED = 0x00000008, // Aura::HandleAuraModStun UNIT_STAT_STUNNED = 0x00000008, // Aura::HandleAuraModStun
UNIT_STAT_ROOT = 0x00000010, // Aura::HandleAuraModRoot UNIT_STAT_ROOT = 0x00000010, // Aura::HandleAuraModRoot
UNIT_STAT_ISOLATED = 0x00000020, // area auras do not affect other players, Aura::HandleAuraModSchoolImmunity 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) // 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) 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, UNIT_STAT_CONFUSED | UNIT_STAT_FLEEING,
// AI disabled by some reason // 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 // above 2 state cases
UNIT_STAT_CAN_NOT_REACT_OR_LOST_CONTROL = UNIT_STAT_CAN_NOT_REACT | UNIT_STAT_LOST_CONTROL, UNIT_STAT_CAN_NOT_REACT_OR_LOST_CONTROL = UNIT_STAT_CAN_NOT_REACT | UNIT_STAT_LOST_CONTROL,

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10056" #define REVISION_NR "10057"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__