summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/Defines.h6
-rw-r--r--source/cFireSimulator.cpp5
-rw-r--r--source/cStairs.h2
-rw-r--r--source/cStep.h2
4 files changed, 11 insertions, 4 deletions
diff --git a/source/Defines.h b/source/Defines.h
index d0279875f..e0880ad24 100644
--- a/source/Defines.h
+++ b/source/Defines.h
@@ -72,6 +72,12 @@ inline bool IsBlockLava(char a_BlockID)
}
+inline bool IsBlockLiquid(char a_BlockID)
+{
+ return IsBlockWater(a_BlockID) || IsBlockLava(a_BlockID);
+}
+
+
diff --git a/source/cFireSimulator.cpp b/source/cFireSimulator.cpp
index 8b6710b74..da447a01f 100644
--- a/source/cFireSimulator.cpp
+++ b/source/cFireSimulator.cpp
@@ -88,10 +88,11 @@ bool cFireSimulator::IsBurnable( char a_BlockID )
return a_BlockID == E_BLOCK_PLANKS
|| a_BlockID == E_BLOCK_LEAVES
|| a_BlockID == E_BLOCK_LOG
- || a_BlockID == E_BLOCK_WHITE_CLOTH
+ || a_BlockID == E_BLOCK_WOOL
|| a_BlockID == E_BLOCK_BOOKCASE
|| a_BlockID == E_BLOCK_FENCE
- || a_BlockID == E_BLOCK_TNT;
+ || a_BlockID == E_BLOCK_TNT
+ || a_BlockID == E_BLOCK_VINES;
}
bool cFireSimulator::FiresForever( char a_BlockID )
diff --git a/source/cStairs.h b/source/cStairs.h
index d796dc56d..e17f4abc1 100644
--- a/source/cStairs.h
+++ b/source/cStairs.h
@@ -6,7 +6,7 @@ public:
static char RotationToMetaData( float a_Rotation, int a_Direction ) //tolua_export
{ //tolua_export
a_Rotation += 90 + 45; // So its not aligned with axis
- int result = 0x0;
+ char result = 0x0;
if( a_Direction == 0)
{
diff --git a/source/cStep.h b/source/cStep.h
index 9fe0131ed..482bb9b7b 100644
--- a/source/cStep.h
+++ b/source/cStep.h
@@ -5,7 +5,7 @@ class cStep //tolua_export
public:
static char DirectionToMetaData( int a_Direction ) //tolua_export
{ //tolua_export
- int result = 0x0;
+ char result = 0x0;
if( a_Direction == 0)
{
result = 0x8;