From 91d49437bd51c8d928e8f5e0c06a8777d9e01f14 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Mon, 26 Jan 2009 18:13:21 -0600
Subject: [PATCH] *Fix charge speed.

--HG--
branch : trunk
---
 src/game/DestinationHolderImp.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/game/DestinationHolderImp.h b/src/game/DestinationHolderImp.h
index f799c8613e..f30768e799 100644
--- a/src/game/DestinationHolderImp.h
+++ b/src/game/DestinationHolderImp.h
@@ -96,14 +96,12 @@ DestinationHolder<TRAVELLER>::StartTravel(TRAVELLER &traveller, bool sendMove)
     else                                                    //Walking on the ground
         dist = sqrt((dx*dx) + (dy*dy));
 
+    float speed;
     if(traveller.GetTraveller().hasUnitState(UNIT_STAT_CHARGING))
-        i_totalTravelTime = 1000;
+        speed = 0.025f;                         // assume it is 25 yard per second
     else
-    {
-        float speed = traveller.Speed();
-        speed *=  0.001f;                                       // speed is in seconds so convert from second to millisecond
-        i_totalTravelTime = static_cast<uint32>(dist/speed);
-    }
+        speed = traveller.Speed() * 0.001f;     // speed is in seconds so convert from second to millisecond
+    i_totalTravelTime = static_cast<uint32>(dist/speed);
 
     i_timeElapsed = 0;
     if(sendMove)