*Fix the quests 'Slay them All' and 'No Mercy Merciless', by manuel

*Minor cleanup

--HG--
branch : trunk

src/game/MotionMaster.cpp

@@ -81,7 +81,7 @@ MotionMaster::~MotionMaster()
 void
 MotionMaster::UpdateMotion(uint32 diff)
 {
-    if( i_owner->hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED) )
+    if( i_owner->hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED) ) // what about UNIT_STAT_DISTRACTED? Why is this not included?
         return;
     assert( !empty() );
     m_cleanFlag |= MMCF_UPDATE;

src/game/WaypointMovementGenerator.cpp

@@ -177,7 +177,7 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff)
                 }
             }
             else
-                i_currentNode++;
+                ++i_currentNode;
 
             node = waypoints->at(i_currentNode);
             InitTraveller(unit, *node);

src/game/WaypointMovementGenerator.h

@@ -39,7 +39,7 @@
 #include <set>
 
 #define FLIGHT_TRAVEL_UPDATE  100
-#define STOP_TIME_FOR_PLAYER  3 * 60 * 1000                         // 3 Minutes
+#define STOP_TIME_FOR_PLAYER  3 * MINUTE * IN_MILISECONDS           // 3 Minutes
 
 template<class T, class P = Path>
 class TRINITY_DLL_SPEC PathMovementBase

src/game/Wintergrasp.cpp

@@ -25,10 +25,20 @@
 
 typedef uint32 TeamPair[2];
 
+enum WintergraspQuest
+{
+    SLAY_THEM_ALL_1 = 13180, //Horde Quest
+    SLAY_THEM_ALL_2 = 13178, //Horde Quest
+
+    NO_MERCY_MERCILESS = 13177,   //Alliance Quest
+    NO_MERCY_MERCILESS_1 = 13179  //Alliance Quest
+};
+
 enum CreatureEntry
 {
     CRE_ENG_A = 30499,
     CRE_ENG_H = 30400,
+    CRE_PVP_KILL = 31086 //Quest Objective
 };
 
 const TeamPair CreatureEntryPair[] =
@@ -734,6 +744,9 @@ void OPvPWintergrasp::HandleKill(Player *killer, Unit *victim)
     {
         if (victim->getLevel() >= 70)
             ok = true;
+
+        if(killer->GetQuestStatus(SLAY_THEM_ALL_1) == QUEST_STATUS_INCOMPLETE || killer->GetQuestStatus(SLAY_THEM_ALL_2) == QUEST_STATUS_INCOMPLETE || killer->GetQuestStatus(NO_MERCY_MERCILESS_1) == QUEST_STATUS_INCOMPLETE || killer->GetQuestStatus(NO_MERCY_MERCILESS) == QUEST_STATUS_INCOMPLETE)
+            killer->KilledMonsterCredit(CRE_PVP_KILL,0);
     }
     else
     {