pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-16 09:21:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #447 from noudess/master

Browse Source 
Fix snow so it ends correctly.
This commit is contained in:
Michael Cook (mackal) 2015-08-08 19:28:00 -04:00
commit f46b88bbde
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zone/zone.cpp
View File

@ -1346,7 +1346,6 @@ void Zone::ChangeWeather()
weathertimer = (duration*60)*1000; weathertimer = (duration*60)*1000;
Weather_Timer->Start(weathertimer); Weather_Timer->Start(weathertimer);
zone->zone_weather = 0;
zone->weather_intensity = 0; zone->weather_intensity = 0;
} }
else if(tmpOldWeather == 2) else if(tmpOldWeather == 2)
@ -1358,7 +1357,6 @@ void Zone::ChangeWeather()
weathertimer = (duration*60)*1000; weathertimer = (duration*60)*1000;
Weather_Timer->Start(weathertimer); Weather_Timer->Start(weathertimer);
zone->zone_weather = 0;
zone->weather_intensity = 0; zone->weather_intensity = 0;
} }
} }
@ -1377,6 +1375,10 @@ void Zone::ChangeWeather()
{ {
Log.Out(Logs::General, Logs::None, "The weather for zone: %s has changed. Old weather was = %i. New weather is = %i The next check will be in %i seconds. Rain chance: %i, Rain duration: %i, Snow chance %i, Snow duration: %i", zone->GetShortName(), tmpOldWeather, zone_weather,Weather_Timer->GetRemainingTime()/1000,rainchance,rainduration,snowchance,snowduration); Log.Out(Logs::General, Logs::None, "The weather for zone: %s has changed. Old weather was = %i. New weather is = %i The next check will be in %i seconds. Rain chance: %i, Rain duration: %i, Snow chance %i, Snow duration: %i", zone->GetShortName(), tmpOldWeather, zone_weather,Weather_Timer->GetRemainingTime()/1000,rainchance,rainduration,snowchance,snowduration);
this->weatherSend(); this->weatherSend();
if (zone->weather_intensity == 0)
{
zone->zone_weather = 0;
}
} }
} }