From e54373160b69c342dd1a625a841bda3707ba7acf Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Thu, 22 Dec 2011 16:30:40 +0000 Subject: Fixes: - Pickups fall through water now (Server-side they stayed in the water surface) - Suppressed some warnings (int to short etc.) - Water is now passable for cTracer git-svn-id: http://mc-server.googlecode.com/svn/trunk@96 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cPlayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/cPlayer.cpp') diff --git a/source/cPlayer.cpp b/source/cPlayer.cpp index 65b6187a6..2087f7927 100644 --- a/source/cPlayer.cpp +++ b/source/cPlayer.cpp @@ -325,7 +325,7 @@ void cPlayer::Heal( int a_Health ) { if( m_Health < 20 ) { - m_Health = MIN(a_Health + m_Health, 20); + m_Health = (short) MIN(a_Health + m_Health, 20); cPacket_UpdateHealth Health; Health.m_Health = m_Health; -- cgit v1.2.3