diff options
| author | MrSmite <mrsmite@att.net> | 2012-12-25 22:25:18 -0500 |
|---|---|---|
| committer | MrSmite <mrsmite@att.net> | 2012-12-25 22:25:18 -0500 |
| commit | f7904b1d4d3ea6d49877c4d95fa24f52cec225e9 (patch) | |
| tree | 574fb99468dc57ce320a403ba8e6ca1b86145ae8 /src | |
| parent | a4733863ecbb9465afb752323628e34bda2847e4 (diff) | |
Update src/server/game/Entities/Unit/Unit.cpp
Revert codestyle changes to cut down on calls to GetCharmerOrOwner()
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 46876c04a36..09f67485868 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12691,11 +12691,12 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced) // Set creature speed rate if (GetTypeId() == TYPEID_UNIT) { - if (isPet() && !isInCombat() && GetCharmerOrOwner()) // Must check for owner or crash on "Tame Beast" + Unit* pOwner = GetCharmerOrOwner(); + if (isPet() && !isInCombat() && pOwner) // Must check for owner or crash on "Tame Beast" { // For every yard over 5, increase speed by 0.01 // to help prevent pet from lagging behind and despawning - float dist = GetDistance(GetCharmerOrOwner()); + float dist = GetDistance(pOwner); float base_rate = 1.00f; // base speed is 100% of owner speed if (dist < 5) @@ -12703,7 +12704,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced) float mult = base_rate + ((dist - 5) * 0.01f); - speed *= GetCharmerOrOwner()->GetSpeedRate(mtype) * mult; // pets derive speed from owner when not in combat + speed *= pOwner->GetSpeedRate(mtype) * mult; // pets derive speed from owner when not in combat } else speed *= ToCreature()->GetCreatureTemplate()->speed_run; // at this point, MOVE_WALK is never reached |