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/Defines.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source/Defines.h') diff --git a/source/Defines.h b/source/Defines.h index ba62a241e..6d86da825 100644 --- a/source/Defines.h +++ b/source/Defines.h @@ -1,6 +1,7 @@ #pragma once #include "MemoryLeak.h" +#include "BlockID.h" //tolua_begin // emissive blocks @@ -45,6 +46,11 @@ inline bool IsValidItem( int a_ItemID ) //tolua_export return IsValidBlock( a_ItemID ); } //tolua_export +inline bool IsBlockWater (char a_BlockID) +{ + return (a_BlockID == E_BLOCK_WATER || a_BlockID == E_BLOCK_STATIONARY_WATER); +} + inline void AddDirection( int & a_X, char & a_Y, int & a_Z, char a_Direction, bool a_bInverse = false ) //tolua_export {//tolua_export if( !a_bInverse ) -- cgit v1.2.3