*Merge.

--HG--
branch : trunk

1 files changed, 2 insertions, 1 deletions

diff --git a/src/game/Unit.h b/src/game/Unit.h
index cbb61eb3c32..08b1b8c2bf6 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -406,6 +406,8 @@ enum UnitMoveType
 #define MAX_MOVE_TYPE     9
 
 extern float baseMoveSpeed[MAX_MOVE_TYPE];
+// assume it is 25 yard per 0.6 second
+#define SPEED_CHARGE    42.0f
 
 enum WeaponAttackType
 {
@@ -1275,7 +1277,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         void AddThreat(Unit* pVictim, float threat, SpellSchoolMask schoolMask = SPELL_SCHOOL_MASK_NORMAL, SpellEntry const *threatSpell = NULL);
         float ApplyTotalThreatModifier(float threat, SpellSchoolMask schoolMask = SPELL_SCHOOL_MASK_NORMAL);
         void DeleteThreatList();
-        //bool SelectHostilTarget();
         void TauntApply(Unit* pVictim);
         void TauntFadeOut(Unit *taunter);
         ThreatManager& getThreatManager() { return m_ThreatManager; }