Core: ported headers cleanup from master branch

3 files changed, 12 insertions, 9 deletions

diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp
index 91125282496..fb26ae61a12 100644
--- a/src/server/game/Weather/Weather.cpp
+++ b/src/server/game/Weather/Weather.cpp
@@ -21,12 +21,14 @@
 */
 
 #include "Weather.h"
-#include "WorldPacket.h"
-#include "Player.h"
 #include "GameTime.h"
 #include "Log.h"
-#include "Util.h"
+#include "Player.h"
+#include "Random.h"
 #include "ScriptMgr.h"
+#include "Util.h"
+#include "World.h"
+#include "WorldPacket.h"
 #include "WorldSession.h"
 
 /// Create the Weather object
@@ -196,7 +198,7 @@ void Weather::SendWeatherUpdateToPlayer(Player* player)
     data << uint32(GetWeatherState());
     data << (float)m_grade;
     data << uint8(0);
-    player->GetSession()->SendPacket(&data);
+    player->SendDirectMessage(&data);
 }
 
 /// Send the new weather to all players in the zone
diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h
index beb9610cdf9..51702ea2b65 100644
--- a/src/server/game/Weather/Weather.h
+++ b/src/server/game/Weather/Weather.h
@@ -43,7 +43,7 @@ struct WeatherData
     uint32 ScriptId;
 };
 
-enum WeatherState
+enum WeatherState : uint32
 {
     WEATHER_STATE_FINE              = 0,
     WEATHER_STATE_FOG               = 1,
diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp
index 6a7e60a2bc0..95728b7e8ae 100644
--- a/src/server/game/Weather/WeatherMgr.cpp
+++ b/src/server/game/Weather/WeatherMgr.cpp
@@ -21,10 +21,11 @@
 */
 
 #include "WeatherMgr.h"
-#include "Weather.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Player.h"
+#include "Weather.h"
 #include "WorldSession.h"
 
 namespace WeatherMgr
@@ -41,7 +42,7 @@ namespace
     WeatherData const* GetWeatherData(uint32 zone_id)
     {
         WeatherZoneMap::const_iterator itr = mWeatherZoneMap.find(zone_id);
-        return (itr != mWeatherZoneMap.end()) ? &itr->second : NULL;
+        return (itr != mWeatherZoneMap.end()) ? &itr->second : nullptr;
     }
 }
 
@@ -69,7 +70,7 @@ Weather* AddWeather(uint32 zone_id)
 
     // zone does not have weather, ignore
     if (!weatherChances)
-        return NULL;
+        return nullptr;
 
     Weather* w = new Weather(zone_id, weatherChances);
     m_weathers[w->GetZone()].reset(w);
@@ -146,7 +147,7 @@ void SendFineWeatherUpdateToPlayer(Player* player)
     data << (uint32)WEATHER_STATE_FINE;
     data << (float)0.0f;
     data << uint8(0);
-    player->GetSession()->SendPacket(&data);
+    player->SendDirectMessage(&data);
 }
 
 void Update(uint32 diff)