flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Converted ArrowEntityTiers to std::chrono

Browse Source
This commit is contained in:
Tycho 2015-01-16 13:13:23 +00:00
parent acc2dcbbc3
commit d6f042da4a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Entities/ArrowEntity.cpp
View File

@ -177,17 +177,17 @@ void cArrowEntity::CollectedBy(cPlayer & a_Dest)
void cArrowEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) void cArrowEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{ {
super::Tick(a_Dt, a_Chunk); super::Tick(a_Dt, a_Chunk);
m_Timer += a_Dt.count(); m_Timer += a_Dt;
if (m_bIsCollected) if (m_bIsCollected)
{ {
if (m_Timer > 500.f) // 0.5 seconds if (m_Timer > std::chrono::milliseconds(500))
{ {
Destroy(); Destroy();
return; return;
} }
} }
else if (m_Timer > 1000 * 60 * 5) // 5 minutes else if (m_Timer > std::chrono::minutes(5))
{ {
Destroy(); Destroy();
return; return;
@ -202,14 +202,14 @@ void cArrowEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
if (!m_HasTeleported) // Sent a teleport already, don't do again if (!m_HasTeleported) // Sent a teleport already, don't do again
{ {
if (m_HitGroundTimer > 500.f) // Send after half a second, could be less, but just in case if (m_HitGroundTimer > std::chrono::milliseconds(500))
{ {
m_World->BroadcastTeleportEntity(*this); m_World->BroadcastTeleportEntity(*this);
m_HasTeleported = true; m_HasTeleported = true;
} }
else else
{ {
m_HitGroundTimer += a_Dt.count(); m_HitGroundTimer += a_Dt;
} }
} }

4
src/Entities/ArrowEntity.h
View File

@ -85,10 +85,10 @@ protected:
bool m_IsCritical; bool m_IsCritical;
/** Timer for pickup collection animation or five minute timeout */ /** Timer for pickup collection animation or five minute timeout */
float m_Timer; std::chrono::milliseconds m_Timer;
/** Timer for client arrow position confirmation via TeleportEntity */ /** Timer for client arrow position confirmation via TeleportEntity */
float m_HitGroundTimer; std::chrono::milliseconds m_HitGroundTimer;
// Whether the arrow has already been teleported into the proper position in the ground. // Whether the arrow has already been teleported into the proper position in the ground.
bool m_HasTeleported; bool m_HasTeleported;