summaryrefslogtreecommitdiff
path: root/src/nodedef.cpp
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/nodedef.cpp
parentb11e1db809aebc22f26887fffd50bd37f1fb6c3a (diff)
downloadminetest-e5652cb75cd891895fab50ce46eb34ab9734d160.tar.gz
minetest-e5652cb75cd891895fab50ce46eb34ab9734d160.tar.bz2
minetest-e5652cb75cd891895fab50ce46eb34ab9734d160.zip
Custom collision boxes node property.
Diffstat (limited to 'src/nodedef.cpp')
-rw-r--r--src/nodedef.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index ef61d0722..5735ef914 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -233,6 +233,7 @@ void ContentFeatures::reset()
damage_per_second = 0;
node_box = NodeBox();
selection_box = NodeBox();
+ collision_box = NodeBox();
waving = 0;
legacy_facedir_simple = false;
legacy_wallmounted = false;
@@ -303,6 +304,7 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version)
// Stuff below should be moved to correct place in a version that otherwise changes
// the protocol version
os<<serializeString(mesh);
+ collision_box.serialize(os, protocol_version);
}
void ContentFeatures::deSerialize(std::istream &is)
@@ -372,6 +374,7 @@ void ContentFeatures::deSerialize(std::istream &is)
// Stuff below should be moved to correct place in a version that
// otherwise changes the protocol version
mesh = deSerializeString(is);
+ collision_box.deSerialize(is);
}catch(SerializationError &e) {};
}