From 8cae65978611476d0da215acf61819a905c68267 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Fri, 14 Jun 2013 12:04:46 +0000 Subject: Add an option to disable object <-> object collision for Lua entities --- src/script/common/c_content.cpp | 1 + src/script/cpp_api/s_entity.cpp | 1 + 2 files changed, 2 insertions(+) (limited to 'src/script') 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); diff --git a/src/script/cpp_api/s_entity.cpp b/src/script/cpp_api/s_entity.cpp index 2a5a6066d..c494e8232 100644 --- a/src/script/cpp_api/s_entity.cpp +++ b/src/script/cpp_api/s_entity.cpp @@ -169,6 +169,7 @@ void ScriptApiEntity::luaentity_GetProperties(u16 id, 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); -- cgit v1.2.3