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

Fixed type-conversion warnings.

Browse Source
This commit is contained in:
Mattes D 2015-01-18 11:02:17 +01:00
parent 6758c1d2a1
commit e211aafaa4
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bindings/LuaState.cpp
View File

@ -843,7 +843,7 @@ void cLuaState::Push(std::chrono::milliseconds a_Value)
{
ASSERT(IsValid());
tolua_pushnumber(m_LuaState, a_Value.count());
tolua_pushnumber(m_LuaState, static_cast<lua_Number>(a_Value.count()));
m_NumCurrentFunctionArgs += 1;
}

8
src/Entities/Entity.cpp
View File

@ -927,11 +927,11 @@ void cEntity::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
if (!m_bOnGround)
{
float fallspeed;
double fallspeed;
if (IsBlockWater(BlockIn))
{
fallspeed = m_Gravity * DtSec.count() / 3; // Fall 3x slower in water
ApplyFriction(NextSpeed, 0.7, DtSec.count());
ApplyFriction(NextSpeed, 0.7, static_cast<float>(DtSec.count()));
}
else if (BlockIn == E_BLOCK_COBWEB)
{
@ -943,11 +943,11 @@ void cEntity::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
// Normal gravity
fallspeed = m_Gravity * DtSec.count();
}
NextSpeed.y += fallspeed;
NextSpeed.y += static_cast<float>(fallspeed);
}
else
{
ApplyFriction(NextSpeed, 0.7, DtSec.count());
ApplyFriction(NextSpeed, 0.7, static_cast<float>(DtSec.count()));
}
// Adjust X and Z speed for COBWEB temporary. This speed modification should be handled inside block handlers since we

4
src/Entities/FireworkEntity.cpp
View File

@ -28,7 +28,7 @@ void cFireworkEntity::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_C
if ((PosY < 0) || (PosY >= cChunkDef::Height))
{
AddSpeedY(1);
AddPosition(GetSpeed() * (a_Dt.count() / 1000));
AddPosition(GetSpeed() * (static_cast<double>(a_Dt.count()) / 1000));
return;
}
@ -53,7 +53,7 @@ void cFireworkEntity::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_C
}
AddSpeedY(1);
AddPosition(GetSpeed() * (a_Dt.count() / 1000));
AddPosition(GetSpeed() * (static_cast<double>(a_Dt.count()) / 1000));
}

2
src/Entities/Minecart.cpp
View File

@ -177,7 +177,7 @@ void cMinecart::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
default: VERIFY(!"Unhandled rail type despite checking if block was rail!"); break;
}
AddPosition(GetSpeed() * (a_Dt.count() / 1000)); // Commit changes; as we use our own engine when on rails, this needs to be done, whereas it is normally in Entity.cpp
AddPosition(GetSpeed() * (static_cast<double>(a_Dt.count()) / 1000)); // Commit changes; as we use our own engine when on rails, this needs to be done, whereas it is normally in Entity.cpp
}
else
{