X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fobject_properties.h;h=082d9a5290ea945e0f7cb6b418acbd9a369fe4b5;hb=454483f26610959526d97c1d318e0d699d78747d;hp=eeb397efa40d3112ee14777dad0b8a3febe8a414;hpb=a0566270d9fa075afa36a7e3e68c690b1b23ba90;p=oweals%2Fminetest.git

diff --git a/src/object_properties.h b/src/object_properties.h
index eeb397efa..082d9a529 100644
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -31,8 +31,9 @@ struct ObjectProperties
 	// Values are BS=1
 	s16 hp_max;
 	bool physical;
+	bool collideWithObjects;
 	float weight;
-	core::aabbox3d<f32> collisionbox;
+	aabb3f collisionbox;
 	std::string visual;
 	std::string mesh;
 	v2f visual_size;
@@ -43,7 +44,14 @@ struct ObjectProperties
 	bool is_visible;
 	bool makes_footstep_sound;
 	float automatic_rotate;
-
+	f32 stepheight;
+	bool automatic_face_movement_dir;
+	f32 automatic_face_movement_dir_offset;
+	bool backface_culling;
+	std::string nametag;
+	video::SColor nametag_color;
+	f32 automatic_face_movement_max_rotation_per_sec;
+	std::string infotext;
 
 	ObjectProperties();
 	std::string dump();
@@ -52,4 +60,3 @@ struct ObjectProperties
 };
 
 #endif
-