aboutsummaryrefslogtreecommitdiff
path: root/src/script/common
diff options
context:
space:
mode:
authorRealBadAngel <maciej.kasatkin@o2.pl>2014-10-18 18:46:16 +0200
committerRealBadAngel <maciej.kasatkin@o2.pl>2014-10-19 20:48:21 +0200
commite5652cb75cd891895fab50ce46eb34ab9734d160 (patch)
treef3a58632b605ad4df441dbada879a8ec4170cf0f /src/script/common
parentb11e1db809aebc22f26887fffd50bd37f1fb6c3a (diff)
downloadminetest-e5652cb75cd891895fab50ce46eb34ab9734d160.tar.gz
minetest-e5652cb75cd891895fab50ce46eb34ab9734d160.tar.bz2
minetest-e5652cb75cd891895fab50ce46eb34ab9734d160.zip
Custom collision boxes node property.
Diffstat (limited to 'src/script/common')
-rw-r--r--src/script/common/c_content.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 4737f1993..58d8c473e 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -432,6 +432,11 @@ ContentFeatures read_content_features(lua_State *L, int index)
f.selection_box = read_nodebox(L, -1);
lua_pop(L, 1);
+ lua_getfield(L, index, "collision_box");
+ if(lua_istable(L, -1))
+ f.collision_box = read_nodebox(L, -1);
+ lua_pop(L, 1);
+
f.waving = getintfield_default(L, index,
"waving", f.waving);