From f260e9211fcba6f65fd131a34a75d288a10d5ebe Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Tue, 27 Aug 2013 19:56:54 +0200 Subject: [PATCH] Entities fall 3x slower in water --- source/Entities/Entity.cpp | 2 +- source/Entities/Entity.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Entities/Entity.cpp b/source/Entities/Entity.cpp index 608f5a73b..b936d8d73 100644 --- a/source/Entities/Entity.cpp +++ b/source/Entities/Entity.cpp @@ -529,7 +529,7 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk) float fallspeed; if (IsBlockWater(BlockIn)) { - fallspeed = -3.0f * a_Dt; // Fall slower in water. + fallspeed = m_Gravity * a_Dt / 3; // Fall 3x slower in water. } else if (BlockIn == E_BLOCK_COBWEB) { diff --git a/source/Entities/Entity.h b/source/Entities/Entity.h index dde3eb8c6..f407cd2c1 100644 --- a/source/Entities/Entity.h +++ b/source/Entities/Entity.h @@ -163,7 +163,7 @@ public: void SetPosY (double a_PosY); void SetPosZ (double a_PosZ); void SetPosition(double a_PosX, double a_PosY, double a_PosZ); - void SetPosition(const Vector3d & a_Pos) { SetPosition(a_Pos.x,a_Pos.y,a_Pos.z);} + void SetPosition(const Vector3d & a_Pos) { SetPosition(a_Pos.x, a_Pos.y, a_Pos.z); } void SetRot (const Vector3f & a_Rot); void SetRotation(double a_Rotation); void SetPitch (double a_Pitch);