diff options
| author | Shauren <none@none> | 2010-12-17 13:43:24 +0100 |
|---|---|---|
| committer | Shauren <none@none> | 2010-12-17 13:43:24 +0100 |
| commit | 82f45966fc00106b52294e4c01a2848ba24e2eb8 (patch) | |
| tree | dd3ee1457f54da1cdeebe3ded7e6e29f282d2bc9 /src/server/scripts/World | |
| parent | ee3fd3ebebcbf85d3ff942eb462b15368b76e8c1 (diff) | |
Core/Unit: Renamed addUnitState/hasUnitState/clearUnitState to AddUnitState/HasUnitState/ClearUnitState
Core/Vehicles: Allow the vehicle to always damage the passenger (removed unneded dbc hacks from scripts)
--HG--
branch : trunk
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 66b8e400a71..2fe252ff098 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1873,7 +1873,7 @@ public: Unit *owner = me->GetCharmerOrOwner(); me->CombatStop(true); - if (owner && !me->hasUnitState(UNIT_STAT_FOLLOW)) + if (owner && !me->HasUnitState(UNIT_STAT_FOLLOW)) { me->GetMotionMaster()->Clear(false); me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle(), MOTION_SLOT_ACTIVE); @@ -2056,7 +2056,7 @@ public: if (!UpdateVictim()) return; - if (!me->hasUnitState(UNIT_STAT_STUNNED)) + if (!me->HasUnitState(UNIT_STAT_STUNNED)) me->SetControlled(true,UNIT_STAT_STUNNED);//disable rotate if (uiEntry != NPC_ADVANCED_TARGET_DUMMY && uiEntry != NPC_TARGET_DUMMY) |