*Merge with 499.

--HG--
branch : trunk

src/game/RandomMovementGenerator.cpp

@@ -27,6 +27,17 @@
 
 #define RUNNING_CHANCE_RANDOMMV 20                                  //will be "1 / RUNNING_CHANCE_RANDOMMV"
 
+template<>
+bool 
+RandomMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const
+{
+    if(i_destinationHolder.HasArrived())
+        return false; 
+    
+    i_destinationHolder.GetDestination(x, y, z); 
+    return true;
+}
+
 template<>
 void
 RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature)

src/game/RandomMovementGenerator.h

@@ -38,7 +38,8 @@ class TRINITY_DLL_SPEC RandomMovementGenerator
         void Finalize(T &) {}
         void Reset(T &);
         bool Update(T &, const uint32 &);
-        void UpdateMapPosition(uint32 mapid, float &x ,float &y, float &z)
+        bool GetDestination(float &x, float &y, float &z) const;
+		void UpdateMapPosition(uint32 mapid, float &x ,float &y, float &z)
         {
             i_destinationHolder.GetLocationNow(mapid, x,y,z);
         }

src/game/Unit.cpp

@@ -8632,6 +8632,11 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
 			{
 				CastingTime = 0;
 			}
+			// Darkmoon Card: Vengeance - 0.1%
+			else if (spellProto->SpellVisual == 9850 && spellProto->SpellIconID == 2230)
+			{
+				CastingTime = 3.5;
+			}
         case SPELLFAMILY_MAGE:
             // Ignite - do not modify, it is (8*Rank)% damage of procing Spell
             if(spellProto->Id==12654)