summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-06-16 20:44:07 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-06-16 20:44:07 +0200
commit3efd8fdabbcbde30f41bf4796b72bce5c6778f70 (patch)
tree45266060fabc71e6a54b901fc7fb86ce257f559f /source
parentLeaves: Applied patch by Luksor. (diff)
downloadcuberite-3efd8fdabbcbde30f41bf4796b72bce5c6778f70.tar
cuberite-3efd8fdabbcbde30f41bf4796b72bce5c6778f70.tar.gz
cuberite-3efd8fdabbcbde30f41bf4796b72bce5c6778f70.tar.bz2
cuberite-3efd8fdabbcbde30f41bf4796b72bce5c6778f70.tar.lz
cuberite-3efd8fdabbcbde30f41bf4796b72bce5c6778f70.tar.xz
cuberite-3efd8fdabbcbde30f41bf4796b72bce5c6778f70.tar.zst
cuberite-3efd8fdabbcbde30f41bf4796b72bce5c6778f70.zip
Diffstat (limited to '')
-rw-r--r--source/Bindings.cpp4
-rw-r--r--source/Bindings.h2
-rw-r--r--source/BlockID.cpp7
-rw-r--r--source/BlockID.h6
4 files changed, 15 insertions, 4 deletions
diff --git a/source/Bindings.cpp b/source/Bindings.cpp
index d91d8b101..643be25ce 100644
--- a/source/Bindings.cpp
+++ b/source/Bindings.cpp
@@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 06/16/12 17:04:45.
+** Generated automatically by tolua++-1.0.92 on 06/16/12 20:12:04.
*/
#ifndef __cplusplus
@@ -20478,7 +20478,9 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
tolua_constant(tolua_S,"E_BLOCK_STONE_BRICKS",E_BLOCK_STONE_BRICKS);
tolua_constant(tolua_S,"E_BLOCK_HUGE_BROWN_MUSHROOM",E_BLOCK_HUGE_BROWN_MUSHROOM);
tolua_constant(tolua_S,"E_BLOCK_HUGE_RED_MUSHROOM",E_BLOCK_HUGE_RED_MUSHROOM);
+ tolua_constant(tolua_S,"E_BLOCK_IRON_BARS",E_BLOCK_IRON_BARS);
tolua_constant(tolua_S,"E_BLOCK_IRON_BAR",E_BLOCK_IRON_BAR);
+ tolua_constant(tolua_S,"E_BLOCK_GLASS_PANE",E_BLOCK_GLASS_PANE);
tolua_constant(tolua_S,"E_BLOCK_GLASS_PLANE",E_BLOCK_GLASS_PLANE);
tolua_constant(tolua_S,"E_BLOCK_MELON",E_BLOCK_MELON);
tolua_constant(tolua_S,"E_BLOCK_PUMPKIN_STEM",E_BLOCK_PUMPKIN_STEM);
diff --git a/source/Bindings.h b/source/Bindings.h
index be611c9d5..a9be7791c 100644
--- a/source/Bindings.h
+++ b/source/Bindings.h
@@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 06/16/12 17:04:45.
+** Generated automatically by tolua++-1.0.92 on 06/16/12 20:12:05.
*/
/* Exported function */
diff --git a/source/BlockID.cpp b/source/BlockID.cpp
index 269bc2f3c..42f4951e6 100644
--- a/source/BlockID.cpp
+++ b/source/BlockID.cpp
@@ -195,16 +195,23 @@ public:
// Spread blocks
g_BlockSpreadLightFalloff[E_BLOCK_AIR] = 1;
+ g_BlockSpreadLightFalloff[E_BLOCK_CAKE] = 1;
g_BlockSpreadLightFalloff[E_BLOCK_CHEST] = 1;
g_BlockSpreadLightFalloff[E_BLOCK_CROPS] = 1;
+ g_BlockSpreadLightFalloff[E_BLOCK_FENCE] = 1;
+ g_BlockSpreadLightFalloff[E_BLOCK_FENCE_GATE] = 1;
g_BlockSpreadLightFalloff[E_BLOCK_FIRE] = 1;
g_BlockSpreadLightFalloff[E_BLOCK_GLASS] = 1;
+ g_BlockSpreadLightFalloff[E_BLOCK_GLASS_PLANE] = 1;
g_BlockSpreadLightFalloff[E_BLOCK_GLOWSTONE] = 1;
+ g_BlockSpreadLightFalloff[E_BLOCK_IRON_BARS] = 1;
+ g_BlockSpreadLightFalloff[E_BLOCK_IRON_DOOR] = 1;
g_BlockSpreadLightFalloff[E_BLOCK_LEAVES] = 1;
g_BlockSpreadLightFalloff[E_BLOCK_SIGN_POST] = 1;
g_BlockSpreadLightFalloff[E_BLOCK_TORCH] = 1;
g_BlockSpreadLightFalloff[E_BLOCK_VINES] = 1;
g_BlockSpreadLightFalloff[E_BLOCK_WALLSIGN] = 1;
+ g_BlockSpreadLightFalloff[E_BLOCK_WOODEN_DOOR] = 1;
// Light in water and lava dissapears faster:
g_BlockSpreadLightFalloff[E_BLOCK_LAVA] = 2;
g_BlockSpreadLightFalloff[E_BLOCK_STATIONARY_LAVA] = 2;
diff --git a/source/BlockID.h b/source/BlockID.h
index 7ec2f9279..67e2833c8 100644
--- a/source/BlockID.h
+++ b/source/BlockID.h
@@ -115,8 +115,10 @@ enum ENUM_BLOCK_ID
E_BLOCK_STONE_BRICKS = 98,
E_BLOCK_HUGE_BROWN_MUSHROOM = 99,
E_BLOCK_HUGE_RED_MUSHROOM = 100,
- E_BLOCK_IRON_BAR = 101,
- E_BLOCK_GLASS_PLANE = 102,
+ E_BLOCK_IRON_BARS = 101,
+ E_BLOCK_IRON_BAR = 101, // Deprecated, use E_BLOCK_IRON_BARS instead
+ E_BLOCK_GLASS_PANE = 102,
+ E_BLOCK_GLASS_PLANE = 102, // Deprecated, use E_BLOCK_GLASS_PANE instead
E_BLOCK_MELON = 103,
E_BLOCK_PUMPKIN_STEM = 104,
E_BLOCK_MELON_STEM = 105,