summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorluksor111@gmail.com <luksor111@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-12-15 14:27:01 +0100
committerluksor111@gmail.com <luksor111@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-12-15 14:27:01 +0100
commit9a839a3a98eee4a6e8c64bb5829baee3fbb0f7e3 (patch)
tree84b0c6c865a67fa45b362c9e8c68e7cef4142389 /source
parentcChunk now tracks its neighbors as direct pointers; used in UnboundedRelGetBlock et al. (diff)
downloadcuberite-9a839a3a98eee4a6e8c64bb5829baee3fbb0f7e3.tar
cuberite-9a839a3a98eee4a6e8c64bb5829baee3fbb0f7e3.tar.gz
cuberite-9a839a3a98eee4a6e8c64bb5829baee3fbb0f7e3.tar.bz2
cuberite-9a839a3a98eee4a6e8c64bb5829baee3fbb0f7e3.tar.lz
cuberite-9a839a3a98eee4a6e8c64bb5829baee3fbb0f7e3.tar.xz
cuberite-9a839a3a98eee4a6e8c64bb5829baee3fbb0f7e3.tar.zst
cuberite-9a839a3a98eee4a6e8c64bb5829baee3fbb0f7e3.zip
Diffstat (limited to '')
-rw-r--r--source/Piston.cpp2
-rw-r--r--source/Player.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/source/Piston.cpp b/source/Piston.cpp
index 9aa09a56e..ee4f030c9 100644
--- a/source/Piston.cpp
+++ b/source/Piston.cpp
@@ -83,6 +83,7 @@ void cPiston::ExtendPiston( int pistx, int pisty, int pistz )
oldz = pistz;
}
m_World->BroadcastBlockAction(pistx, pisty, pistz, 0, pistonMeta, E_BLOCK_PISTON);
+ m_World->BroadcastSoundEffect("tile.piston.out", pistx * 8, pisty * 8, pistz * 8, 0.5f, 0.7f);
m_World->FastSetBlock( pistx, pisty, pistz, pistonBlock, pistonMeta | 0x8 );
int extx = pistx;
@@ -108,6 +109,7 @@ void cPiston::RetractPiston( int pistx, int pisty, int pistz )
return;
}
m_World->BroadcastBlockAction(pistx, pisty, pistz, 1, pistonMeta & ~(8), E_BLOCK_PISTON);
+ m_World->BroadcastSoundEffect("tile.piston.in", pistx * 8, pisty * 8, pistz * 8, 0.5f, 0.7f);
m_World->FastSetBlock(pistx, pisty, pistz, pistonBlock, pistonMeta & ~(8));
AddDir(pistx, pisty, pistz, pistonMeta & 7, 1)
diff --git a/source/Player.cpp b/source/Player.cpp
index 31dc001ca..555b8d3f9 100644
--- a/source/Player.cpp
+++ b/source/Player.cpp
@@ -291,7 +291,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
if (m_bTouchGround)
{
- float Dist = (float)(m_LastGroundHeight - m_Pos.y);
+ float Dist = (float)(m_LastGroundHeight - floor(m_Pos.y));
int Damage = (int)(Dist - 3.f);
if(m_LastJumpHeight > m_LastGroundHeight) Damage++;
m_LastJumpHeight = (float)m_Pos.y;