1 files changed, 11 insertions, 37 deletions
diff --git a/src/server/game/Weather/WeatherMgr.h b/src/server/game/Weather/WeatherMgr.h
index b6fb69dc347..f85fe827fc4 100755
--- a/src/server/game/Weather/WeatherMgr.h
+++ b/src/server/game/Weather/WeatherMgr.h
@@ -23,46 +23,20 @@
 #ifndef __WEATHERMGR_H
 #define __WEATHERMGR_H
 
-#include "Common.h"
-#include "SharedDefines.h"
-#include "Timer.h"
-#include "Weather.h"
-#include <ace/Singleton.h>
+#include "Define.h"
 
-class WeatherMgr
-{
-    friend class ACE_Singleton<WeatherMgr, ACE_Null_Mutex>;
-    WeatherMgr() {}
-    ~WeatherMgr();
-
-    public:
-
-        void LoadWeatherData();
-
-        Weather* FindWeather(uint32 id) const;
-        Weather* AddWeather(uint32 zone_id);
-        void RemoveWeather(uint32 zone_id);
+class Weather;
+class Player;
 
-        WeatherData const* GetWeatherChances(uint32 zone_id) const
-        {
-            WeatherZoneMap::const_iterator itr = mWeatherZoneMap.find(zone_id);
-            if (itr != mWeatherZoneMap.end())
-                return &itr->second;
-            else
-                return NULL;
-        }
-
-        void Update(uint32 diff);
-
-        typedef UNORDERED_MAP<uint32, Weather*> WeatherMap;
-        typedef UNORDERED_MAP<uint32, WeatherData> WeatherZoneMap;
-
-    private:
+namespace WeatherMgr
+{
+    void LoadWeatherData();
 
-        WeatherMap m_weathers;
-        WeatherZoneMap mWeatherZoneMap;
-};
+    Weather* FindWeather(uint32 id);
+    Weather* AddWeather(uint32 zone_id);
+    void RemoveWeather(uint32 zone_id);
 
-#define sWeatherMgr ACE_Singleton<WeatherMgr, ACE_Null_Mutex>::instance()
+    void Update(uint32 diff);
+}
 
 #endif