aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authorNevan <none@none>2009-08-18 19:37:31 +0200
committerNevan <none@none>2009-08-18 19:37:31 +0200
commitd3d2eb91bbac388f9ffc1e89147c4129e7bcf9af (patch)
tree8610f7745fa314004fe43de3bb27d69f28d43de2 /src/game/Unit.cpp
parent483f40cbd8898be09f5e56baa0a57b0e37c83a95 (diff)
*Fix Pet movement speed at combar reset. Thanks BlackYoghurt.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 897db20e48b..d21e870a533 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10448,7 +10448,8 @@ void Unit::ClearInCombat()
if(Unit *owner = GetOwner())
{
for(uint8 i = 0; i < MAX_MOVE_TYPE; ++i)
- SetSpeed(UnitMoveType(i), owner->GetSpeedRate(UnitMoveType(i)), true);
+ if(owner->GetSpeedRate(UnitMoveType(i)) > GetSpeedRate(UnitMoveType(i)))
+ SetSpeed(UnitMoveType(i), owner->GetSpeedRate(UnitMoveType(i)), true);
}
}
else if(!isCharmed())