diff options
author | Discover- <amort11@hotmail.com> | 2013-09-23 16:47:47 +0200 |
---|---|---|
committer | Discover- <amort11@hotmail.com> | 2013-09-23 16:47:47 +0200 |
commit | a0db0728f2f48e7ca4156115b03e63d7ff2164c1 (patch) | |
tree | c17b6d0bdc34f0a8297216f21dd7deb5df4eddcc /src/server/game/Weather/Weather.cpp | |
parent | 9653576cb4cc9449898d6af691c045d68e9361c5 (diff) | |
parent | 4498ac0062d56aa0a0f2b9a21358f12f83c4b1f7 (diff) |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Weather/Weather.cpp')
-rw-r--r-- | src/server/game/Weather/Weather.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp index 38d64eedd5c..0457dc7e033 100644 --- a/src/server/game/Weather/Weather.cpp +++ b/src/server/game/Weather/Weather.cpp @@ -93,8 +93,9 @@ bool Weather::ReGenerate() //78 days between January 1st and March 20nd; 365/4=91 days by season // season source http://aa.usno.navy.mil/data/docs/EarthSeasons.html time_t gtime = sWorld->GetGameTime(); - struct tm * ltime = localtime(>ime); - uint32 season = ((ltime->tm_yday - 78 + 365)/91)%4; + struct tm ltime; + ACE_OS::localtime_r(>ime, <ime); + uint32 season = ((ltime.tm_yday - 78 + 365)/91)%4; static char const* seasonName[WEATHER_SEASONS] = { "spring", "summer", "fall", "winter" }; |