diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-09-13 01:21:43 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-09-13 01:21:43 +0200 |
| commit | 69afc4dbba9ea22ed53756d0ec2b8ff138ddf781 (patch) | |
| tree | 237871b3c615fa6e1f96b89133d3d6df4e2360dd /src/Entities/Entity.cpp | |
| parent | Merge branch 'master' into 1.8-Protocol (diff) | |
| parent | Fixed friction being applied whilst airborne (diff) | |
| download | cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.tar cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.tar.gz cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.tar.bz2 cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.tar.lz cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.tar.xz cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.tar.zst cuberite-69afc4dbba9ea22ed53756d0ec2b8ff138ddf781.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index fba688847..2d2a75a75 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -941,19 +941,21 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk) } NextSpeed.y += fallspeed; } - - // Friction - if (NextSpeed.SqrLength() > 0.0004f) + else { - NextSpeed.x *= 0.7f / (1 + a_Dt); - if (fabs(NextSpeed.x) < 0.05) - { - NextSpeed.x = 0; - } - NextSpeed.z *= 0.7f / (1 + a_Dt); - if (fabs(NextSpeed.z) < 0.05) + // Friction on ground + if (NextSpeed.SqrLength() > 0.0004f) { - NextSpeed.z = 0; + NextSpeed.x *= 0.7f / (1 + a_Dt); + if (fabs(NextSpeed.x) < 0.05) + { + NextSpeed.x = 0; + } + NextSpeed.z *= 0.7f / (1 + a_Dt); + if (fabs(NextSpeed.z) < 0.05) + { + NextSpeed.z = 0; + } } } |