diff options
| author | Mattes D <github@xoft.cz> | 2015-01-18 11:02:17 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-01-18 11:02:17 +0100 |
| commit | e211aafaa45b0e4a12e9c50ee445377077ea8172 (patch) | |
| tree | 649827f49829a154a4154d2368ea923f479af58c /src/Entities/Entity.cpp | |
| parent | correct comment to say milliseconds (diff) | |
| download | cuberite-e211aafaa45b0e4a12e9c50ee445377077ea8172.tar cuberite-e211aafaa45b0e4a12e9c50ee445377077ea8172.tar.gz cuberite-e211aafaa45b0e4a12e9c50ee445377077ea8172.tar.bz2 cuberite-e211aafaa45b0e4a12e9c50ee445377077ea8172.tar.lz cuberite-e211aafaa45b0e4a12e9c50ee445377077ea8172.tar.xz cuberite-e211aafaa45b0e4a12e9c50ee445377077ea8172.tar.zst cuberite-e211aafaa45b0e4a12e9c50ee445377077ea8172.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index c64d94528..c51a27961 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -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 |