diff options
| author | xinef1 <w.szyszko2@gmail.com> | 2017-03-02 02:19:25 +0100 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2017-03-01 22:19:25 -0300 |
| commit | 7567cafec84080d26ea513242a1f540a823b8f9d (patch) | |
| tree | f6f37a7cc4d06db0dbb0e08a01f8a18cf47ac955 /src/server/game/Weather/Weather.cpp | |
| parent | 7011aabb56f061fc889ec42ce32b7605ceb35b53 (diff) | |
Ensure that all actions are compared to fixed point in time (ie. world update start) (#18910)
- Actions will not be dependent on processing moment
- Increased GameObjects cooldown resolution to milliseconds, fixes arming time of traps to be exactly one second and not something from range (1000, 1999)
- Created GameTime namespace and UpdateTime class and moved there some code out of world
Diffstat (limited to 'src/server/game/Weather/Weather.cpp')
| -rw-r--r-- | src/server/game/Weather/Weather.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp index b989af67ec5..91125282496 100644 --- a/src/server/game/Weather/Weather.cpp +++ b/src/server/game/Weather/Weather.cpp @@ -23,7 +23,7 @@ #include "Weather.h" #include "WorldPacket.h" #include "Player.h" -#include "World.h" +#include "GameTime.h" #include "Log.h" #include "Util.h" #include "ScriptMgr.h" @@ -91,7 +91,7 @@ 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(); + time_t gtime = GameTime::GetGameTime(); struct tm ltime; localtime_r(>ime, <ime); uint32 season = ((ltime.tm_yday - 78 + 365)/91)%4; |
