aboutsummaryrefslogtreecommitdiff
path: root/src/script/common
diff options
context:
space:
mode:
authorPilzAdam <pilzadam@minetest.net>2013-06-14 12:04:46 +0000
committerRealBadAngel <mk@realbadangel.pl>2013-07-20 20:43:11 +0200
commit8cae65978611476d0da215acf61819a905c68267 (patch)
tree2fec7ef03de8946149c8d118b49ca472e0d048a6 /src/script/common
parent413f0d0353d49d7baed32540d73cbec99e35658a (diff)
downloadminetest-8cae65978611476d0da215acf61819a905c68267.tar.gz
minetest-8cae65978611476d0da215acf61819a905c68267.tar.bz2
minetest-8cae65978611476d0da215acf61819a905c68267.zip
Add an option to disable object <-> object collision for Lua entities
Diffstat (limited to 'src/script/common')
-rw-r--r--src/script/common/c_content.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 7d18454fd..dcffabb8b 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -123,6 +123,7 @@ void read_object_properties(lua_State *L, int index,
prop->hp_max = getintfield_default(L, -1, "hp_max", 10);
getboolfield(L, -1, "physical", prop->physical);
+ getboolfield(L, -1, "collide_with_objects", prop->collideWithObjects);
getfloatfield(L, -1, "weight", prop->weight);