diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Defines.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/Defines.h b/src/Defines.h index b3dbcc93e..5b868b2e5 100644 --- a/src/Defines.h +++ b/src/Defines.h @@ -254,16 +254,18 @@ inline bool IsValidItem(int a_ItemType) -inline bool IsBlockWater(BLOCKTYPE a_BlockType, bool a_IncludeFrozenWater = false) +inline bool IsBlockWater(BLOCKTYPE a_BlockType) { - if (a_IncludeFrozenWater) - { - return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER) || (a_BlockType == E_BLOCK_ICE)); - } - else - { - return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER)); - } + return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER)); +} + + + + + +inline bool IsBlockWaterOrIce(BLOCKTYPE a_BlockType) +{ + return (IsBlockWater(a_BlockType) || (a_BlockType == E_BLOCK_ICE)); } |