*Wintergrasp: Prevent defenders team to click the relic. Patch by Spp.

*Zum'Rah Area Trigger Script, Zum'Rah should become hostile when approached. By totoro.
*Judgement of Light PPM based, not 100%. By Drevi.
*Fix Deflection Exploit. By manuel, thanks to TheNecromancer and Gyullo.
*Correct Wintergrasp Tenacity formulas, by Gyullo.
*A Spirit Guide Escort Quest, code from SD2, patch by manuel.
*TrullyOne/MeanMachine Waypoint System Restored. Patch by XTElite1.

--HG--
branch : trunk

1 files changed, 4 insertions, 7 deletions

diff --git a/src/game/WaypointManager.h b/src/game/WaypointManager.h
index a8f2d5746e9..85f8b765d45 100644
--- a/src/game/WaypointManager.h
+++ b/src/game/WaypointManager.h
@@ -34,9 +34,7 @@ struct WaypointData
 };
 
 typedef std::vector<WaypointData*> WaypointPath;
-typedef UNORDERED_MAP<uint32, WaypointPath*> WaypointPathMap;
-
-extern WaypointPathMap WaypointPathHolder;
+extern UNORDERED_MAP<uint32, WaypointPath*> waypoint_map;
 
 class WaypointStore
 {
@@ -50,10 +48,9 @@ class WaypointStore
 
         WaypointPath* GetPath(uint32 id)
         {
-            WaypointPathMap::iterator itr = WaypointPathHolder.find(id);
-            if(itr != WaypointPathHolder.end())
-                return itr->second;
-            return NULL;
+            if(waypoint_map.find(id) != waypoint_map.end())
+                return waypoint_map[id];
+            else return 0;
         }
 
         inline uint32 GetRecordsCount() { return records; }