summaryrefslogtreecommitdiffstats
path: root/src/Defines.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/Defines.h')
-rw-r--r--src/Defines.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Defines.h b/src/Defines.h
index 3a26f4be6..b3dbcc93e 100644
--- a/src/Defines.h
+++ b/src/Defines.h
@@ -254,9 +254,16 @@ inline bool IsValidItem(int a_ItemType)
-inline bool IsBlockWater(BLOCKTYPE a_BlockType)
+inline bool IsBlockWater(BLOCKTYPE a_BlockType, bool a_IncludeFrozenWater = false)
{
- return ((a_BlockType == E_BLOCK_WATER) || (a_BlockType == E_BLOCK_STATIONARY_WATER));
+ 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));
+ }
}