diff options
| author | PilzAdam <pilzadam@minetest.net> | 2013-06-14 12:04:46 +0000 |
|---|---|---|
| committer | RealBadAngel <mk@realbadangel.pl> | 2013-07-20 20:43:11 +0200 |
| commit | 8cae65978611476d0da215acf61819a905c68267 (patch) | |
| tree | 2fec7ef03de8946149c8d118b49ca472e0d048a6 /src/object_properties.cpp | |
| parent | 413f0d0353d49d7baed32540d73cbec99e35658a (diff) | |
| download | minetest-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/object_properties.cpp')
| -rw-r--r-- | src/object_properties.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/object_properties.cpp b/src/object_properties.cpp index 6086bf09f..c2debf328 100644 --- a/src/object_properties.cpp +++ b/src/object_properties.cpp @@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ObjectProperties::ObjectProperties(): hp_max(1), physical(false), + collideWithObjects(true), weight(5), collisionbox(-0.5,-0.5,-0.5, 0.5,0.5,0.5), visual("sprite"), @@ -49,6 +50,7 @@ std::string ObjectProperties::dump() std::ostringstream os(std::ios::binary); os<<"hp_max="<<hp_max; os<<", physical="<<physical; + os<<", collideWithObjects="<<collideWithObjects; os<<", weight="<<weight; os<<", collisionbox="<<PP(collisionbox.MinEdge)<<","<<PP(collisionbox.MaxEdge); os<<", visual="<<visual; @@ -97,6 +99,7 @@ void ObjectProperties::serialize(std::ostream &os) const for(u32 i=0; i<colors.size(); i++){ writeARGB8(os, colors[i]); } + writeU8(os, collideWithObjects); // Add stuff only at the bottom. // Never remove anything, because we don't want new versions of this } @@ -129,6 +132,7 @@ void ObjectProperties::deSerialize(std::istream &is) for(u32 i=0; i<color_count; i++){ colors.push_back(readARGB8(is)); } + collideWithObjects = readU8(is); }catch(SerializationError &e){} } else |