diff options
author | Tycho <work.tycho+git@gmail.com> | 2015-01-11 22:12:26 +0100 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2015-01-11 22:12:26 +0100 |
commit | 2a9664d6ca8aa9eb4f554301e4d9b0ec33b465ce (patch) | |
tree | 86e5b6b66d4791bd64485313db23d7f281f59ab5 /src/Entities/Pickup.cpp | |
parent | Created new type cTickTime and rewrote cWorld::TickThread to use it (diff) | |
download | cuberite-2a9664d6ca8aa9eb4f554301e4d9b0ec33b465ce.tar cuberite-2a9664d6ca8aa9eb4f554301e4d9b0ec33b465ce.tar.gz cuberite-2a9664d6ca8aa9eb4f554301e4d9b0ec33b465ce.tar.bz2 cuberite-2a9664d6ca8aa9eb4f554301e4d9b0ec33b465ce.tar.lz cuberite-2a9664d6ca8aa9eb4f554301e4d9b0ec33b465ce.tar.xz cuberite-2a9664d6ca8aa9eb4f554301e4d9b0ec33b465ce.tar.zst cuberite-2a9664d6ca8aa9eb4f554301e4d9b0ec33b465ce.zip |
Diffstat (limited to 'src/Entities/Pickup.cpp')
-rw-r--r-- | src/Entities/Pickup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp index e5e28446d..accb42a63 100644 --- a/src/Entities/Pickup.cpp +++ b/src/Entities/Pickup.cpp @@ -110,12 +110,12 @@ void cPickup::SpawnOn(cClientHandle & a_Client) -void cPickup::Tick(float a_Dt, cChunk & a_Chunk) +void cPickup::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) { super::Tick(a_Dt, a_Chunk); BroadcastMovementUpdate(); // Notify clients of position - m_Timer += a_Dt; + m_Timer += a_Dt.count(); if (!m_bCollected) { @@ -142,7 +142,7 @@ void cPickup::Tick(float a_Dt, cChunk & a_Chunk) { m_bCollected = true; m_Timer = 0; // We have to reset the timer. - m_Timer += a_Dt; // In case we have to destroy the pickup in the same tick. + m_Timer += a_Dt.count(); // In case we have to destroy the pickup in the same tick. if (m_Timer > 500.f) { Destroy(true); |