From 50e87ac9787314a805e08ca623717057869e7348 Mon Sep 17 00:00:00 2001 From: "luksor111@gmail.com" Date: Tue, 27 Nov 2012 22:17:07 +0000 Subject: Fixed warnings in Player.cpp git-svn-id: http://mc-server.googlecode.com/svn/trunk@1071 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Player.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/Player.cpp b/source/Player.cpp index fea438146..31dc001ca 100644 --- a/source/Player.cpp +++ b/source/Player.cpp @@ -274,7 +274,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround) if (!m_bTouchGround) { - if(m_Pos.y > m_LastJumpHeight) m_LastJumpHeight = m_Pos.y; + if(m_Pos.y > m_LastJumpHeight) m_LastJumpHeight = (float)m_Pos.y; cWorld* World = GetWorld(); char BlockID = World->GetBlock( float2int(m_Pos.x), float2int(m_Pos.y), float2int(m_Pos.z) ); if( BlockID != E_BLOCK_AIR ) @@ -294,7 +294,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround) float Dist = (float)(m_LastGroundHeight - m_Pos.y); int Damage = (int)(Dist - 3.f); if(m_LastJumpHeight > m_LastGroundHeight) Damage++; - m_LastJumpHeight = m_Pos.y; + m_LastJumpHeight = (float)m_Pos.y; if (Damage > 0) { TakeDamage(Damage, 0); -- cgit v1.2.3