summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-09-07 22:42:33 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-09-07 22:42:33 +0200
commit35efe9c72739b37773439c257c301e5fee22ada7 (patch)
tree62a1ec3c87c76ba01eb26154df389ed163503128
parentFurther physics improvements [SEE DESC] (diff)
downloadcuberite-35efe9c72739b37773439c257c301e5fee22ada7.tar
cuberite-35efe9c72739b37773439c257c301e5fee22ada7.tar.gz
cuberite-35efe9c72739b37773439c257c301e5fee22ada7.tar.bz2
cuberite-35efe9c72739b37773439c257c301e5fee22ada7.tar.lz
cuberite-35efe9c72739b37773439c257c301e5fee22ada7.tar.xz
cuberite-35efe9c72739b37773439c257c301e5fee22ada7.tar.zst
cuberite-35efe9c72739b37773439c257c301e5fee22ada7.zip
Diffstat (limited to '')
-rw-r--r--source/Entities/Entity.cpp3
-rw-r--r--source/Entities/Pickup.cpp1
2 files changed, 2 insertions, 2 deletions
diff --git a/source/Entities/Entity.cpp b/source/Entities/Entity.cpp
index a74f80058..0298ca960 100644
--- a/source/Entities/Entity.cpp
+++ b/source/Entities/Entity.cpp
@@ -528,7 +528,8 @@ void cEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
m_bOnGround = true;
LOGD("Entity #%d (%s) is inside a block at {%d,%d,%d}",
- m_UniqueID, GetClass(), BlockX, BlockY, BlockZ);
+ m_UniqueID, GetClass(), BlockX, BlockY,
+ );
}
if (!m_bOnGround)
diff --git a/source/Entities/Pickup.cpp b/source/Entities/Pickup.cpp
index ef1581c1a..db7be8b04 100644
--- a/source/Entities/Pickup.cpp
+++ b/source/Entities/Pickup.cpp
@@ -33,7 +33,6 @@ cPickup::cPickup(int a_MicroPosX, int a_MicroPosY, int a_MicroPosZ, const cItem
m_MaxHealth = 5;
m_Health = 5;
SetSpeed(a_SpeedX, a_SpeedY, a_SpeedZ);
- m_Gravity = -10.0;
}