diff options
Diffstat (limited to 'src')
-rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 2 | ||||
-rwxr-xr-x | src/server/game/Weather/Weather.cpp | 8 | ||||
-rwxr-xr-x | src/server/game/Weather/Weather.h | 1 | ||||
-rwxr-xr-x | src/server/game/Weather/WeatherMgr.cpp | 8 | ||||
-rwxr-xr-x | src/server/game/Weather/WeatherMgr.h | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index f860450d167..9b4b8b8251e 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7434,7 +7434,7 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea) if (!WeatherMgr::AddWeather(zone->ID)) { // send fine weather packet to remove old zone's weather - Weather::SendFineWeatherUpdateToPlayer(this); + WeatherMgr::SendFineWeatherUpdateToPlayer(this); } } } diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp index 7ccfd583cfd..0e98ebc7b17 100755 --- a/src/server/game/Weather/Weather.cpp +++ b/src/server/game/Weather/Weather.cpp @@ -197,14 +197,6 @@ void Weather::SendWeatherUpdateToPlayer(Player* player) player->GetSession()->SendPacket(&data); } -void Weather::SendFineWeatherUpdateToPlayer(Player* player) -{ - WorldPacket data(SMSG_WEATHER, (4+4+4)); - - data << (uint32)WEATHER_STATE_FINE << (float)0.0f << uint8(0); - player->GetSession()->SendPacket(&data); -} - /// Send the new weather to all players in the zone bool Weather::UpdateWeather() { diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h index 3db1b503eb1..4b2d927f690 100755 --- a/src/server/game/Weather/Weather.h +++ b/src/server/game/Weather/Weather.h @@ -73,7 +73,6 @@ class Weather bool UpdateWeather(); void SendWeatherUpdateToPlayer(Player* player); - static void SendFineWeatherUpdateToPlayer(Player* player); void SetWeather(WeatherType type, float grade); /// For which zone is this weather? diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp index bf45eb1f692..938ff46a953 100755 --- a/src/server/game/Weather/WeatherMgr.cpp +++ b/src/server/game/Weather/WeatherMgr.cpp @@ -141,6 +141,14 @@ void LoadWeatherData() sLog->outString(); } +void SendFineWeatherUpdateToPlayer(Player* player) +{ + WorldPacket data(SMSG_WEATHER, (4+4+4)); + + data << (uint32)WEATHER_STATE_FINE << (float)0.0f << uint8(0); + player->GetSession()->SendPacket(&data); +} + void Update(uint32 diff) { ///- Send an update signal to Weather objects diff --git a/src/server/game/Weather/WeatherMgr.h b/src/server/game/Weather/WeatherMgr.h index f85fe827fc4..4cc64f73533 100755 --- a/src/server/game/Weather/WeatherMgr.h +++ b/src/server/game/Weather/WeatherMgr.h @@ -36,6 +36,8 @@ namespace WeatherMgr Weather* AddWeather(uint32 zone_id); void RemoveWeather(uint32 zone_id); + void SendFineWeatherUpdateToPlayer(Player* player); + void Update(uint32 diff); } |