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

Initial convertion of a_Dt to std::chrono

Browse Source 
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
This commit is contained in:
Tycho
2015-01-11 21:12:26 +00:00
parent 4f75b94c99
commit 2a9664d6ca
117 changed files with 221 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mobs/Monster.cpp
View File

@@ -252,14 +252,14 @@ bool cMonster::ReachedFinalDestination()
void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
void cMonster::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{
super::Tick(a_Dt, a_Chunk);
if (m_Health <= 0)
{
// The mob is dead, but we're still animating the "puff" they leave when they die
m_DestroyTimer += a_Dt / 1000;
m_DestroyTimer += a_Dt.count() / 1000;
if (m_DestroyTimer > 1)
{
Destroy(true);
@@ -275,8 +275,6 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
// Burning in daylight
HandleDaylightBurning(a_Chunk);
a_Dt /= 1000;
if (m_bMovingToDestination)
{
if (m_bOnGround)
@@ -347,18 +345,18 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
case IDLE:
{
// If enemy passive we ignore checks for player visibility
InStateIdle(a_Dt);
InStateIdle(std::chrono::duration_cast<std::chrono::seconds>(a_Dt).count());
break;
}
case CHASING:
{
// If we do not see a player anymore skip chasing action
InStateChasing(a_Dt);
InStateChasing(std::chrono::duration_cast<std::chrono::seconds>(a_Dt).count());
break;
}
case ESCAPING:
{
InStateEscaping(a_Dt);
InStateEscaping(std::chrono::duration_cast<std::chrono::seconds>(a_Dt).count());
break;
}