diff options
author | xinef1 <w.szyszko2@gmail.com> | 2017-03-02 02:19:25 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2019-08-17 20:04:14 +0200 |
commit | 60663d1374beef3103f4787152654034fa4a8897 (patch) | |
tree | 38e07d44442ad903a9729536942e8e253a072274 /src/server/game/Warden/Warden.cpp | |
parent | 98180ecdc179386270e93b80c0db8344b659557f (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
(cherrypicked from 7567cafec84080d26ea513242a1f540a823b8f9d)
Diffstat (limited to 'src/server/game/Warden/Warden.cpp')
-rw-r--r-- | src/server/game/Warden/Warden.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp index 5e3f731814c..40c59e4878f 100644 --- a/src/server/game/Warden/Warden.cpp +++ b/src/server/game/Warden/Warden.cpp @@ -22,6 +22,7 @@ #include "Log.h" #include "Opcodes.h" #include "ByteBuffer.h" +#include "GameTime.h" #include "World.h" #include "Util.h" #include "Warden.h" @@ -96,7 +97,7 @@ void Warden::Update() { if (_initialized) { - uint32 currentTimestamp = getMSTime(); + uint32 currentTimestamp = GameTime::GetGameTimeMS(); uint32 diff = currentTimestamp - _previousTimestamp; _previousTimestamp = currentTimestamp; |