diff options
| author | Mattes D <github@xoft.cz> | 2015-01-18 11:21:36 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-01-18 11:21:36 +0100 |
| commit | e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3 (patch) | |
| tree | 75983459166f6ebebebcc5e4bfb9c551f4e3aedb /src/Entities/ExpOrb.cpp | |
| parent | Merge pull request #1707 from UltraCoderRU/master (diff) | |
| parent | Fixed type-conversion warnings. (diff) | |
| download | cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.tar cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.tar.gz cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.tar.bz2 cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.tar.lz cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.tar.xz cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.tar.zst cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.zip | |
Diffstat (limited to 'src/Entities/ExpOrb.cpp')
| -rw-r--r-- | src/Entities/ExpOrb.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Entities/ExpOrb.cpp b/src/Entities/ExpOrb.cpp index 751308661..db7f6f2c8 100644 --- a/src/Entities/ExpOrb.cpp +++ b/src/Entities/ExpOrb.cpp @@ -8,7 +8,7 @@ cExpOrb::cExpOrb(double a_X, double a_Y, double a_Z, int a_Reward) : cEntity(etExpOrb, a_X, a_Y, a_Z, 0.98, 0.98) , m_Reward(a_Reward) - , m_Timer(0.f) + , m_Timer(0) { SetMaxHealth(5); SetHealth(5); @@ -21,7 +21,7 @@ cExpOrb::cExpOrb(double a_X, double a_Y, double a_Z, int a_Reward) cExpOrb::cExpOrb(const Vector3d & a_Pos, int a_Reward) : cEntity(etExpOrb, a_Pos.x, a_Pos.y, a_Pos.z, 0.98, 0.98) , m_Reward(a_Reward) - , m_Timer(0.f) + , m_Timer(0) { SetMaxHealth(5); SetHealth(5); @@ -42,7 +42,7 @@ void cExpOrb::SpawnOn(cClientHandle & a_Client) -void cExpOrb::Tick(float a_Dt, cChunk & a_Chunk) +void cExpOrb::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) { cPlayer * a_ClosestPlayer(m_World->FindClosestPlayer(Vector3f(GetPosition()), 5)); if (a_ClosestPlayer != nullptr) @@ -70,7 +70,7 @@ void cExpOrb::Tick(float a_Dt, cChunk & a_Chunk) HandlePhysics(a_Dt, a_Chunk); m_Timer += a_Dt; - if (m_Timer >= 1000 * 60 * 5) // 5 minutes + if (m_Timer >= std::chrono::minutes(5)) { Destroy(true); } |