summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorproller <proller@github.com>2013-07-13 21:48:14 +0400
committerproller <proller@github.com>2013-07-13 22:13:24 +0400
commit9733dd5b5e5516e18775665db132b2446492716c (patch)
treecb665ab99ebab101c563076a9e31a94a2ce293d4 /src/script
parenta70993d6d20b4668556a8792ecd952d84a7e6939 (diff)
downloadminetest-9733dd5b5e5516e18775665db132b2446492716c.tar.gz
minetest-9733dd5b5e5516e18775665db132b2446492716c.tar.bz2
minetest-9733dd5b5e5516e18775665db132b2446492716c.zip
Leveled nodebox
Diffstat (limited to 'src/script')
-rw-r--r--src/script/common/c_content.cpp2
-rw-r--r--src/script/cpp_api/s_node.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 4ea296523..11f749160 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -389,6 +389,8 @@ ContentFeatures read_content_features(lua_State *L, int index)
// the slowest possible
f.liquid_viscosity = getintfield_default(L, index,
"liquid_viscosity", f.liquid_viscosity);
+ f.leveled = getintfield_default(L, index, "leveled", f.leveled);
+
getboolfield(L, index, "liquid_renewable", f.liquid_renewable);
getboolfield(L, index, "drowning", f.drowning);
// Amount of light the node emits
diff --git a/src/script/cpp_api/s_node.cpp b/src/script/cpp_api/s_node.cpp
index 969e2f4d9..49a825cac 100644
--- a/src/script/cpp_api/s_node.cpp
+++ b/src/script/cpp_api/s_node.cpp
@@ -50,6 +50,7 @@ struct EnumString ScriptApiNode::es_ContentParamType2[] =
{CPT2_FLOWINGLIQUID, "flowingliquid"},
{CPT2_FACEDIR, "facedir"},
{CPT2_WALLMOUNTED, "wallmounted"},
+ {CPT2_LEVELED, "leveled"},
{0, NULL},
};
@@ -73,6 +74,7 @@ struct EnumString ScriptApiNode::es_NodeBoxType[] =
{NODEBOX_REGULAR, "regular"},
{NODEBOX_FIXED, "fixed"},
{NODEBOX_WALLMOUNTED, "wallmounted"},
+ {NODEBOX_LEVELED, "leveled"},
{0, NULL},
};