Add cancel button to password change menu. (#5720)

[oweals/minetest.git] / src / object_properties.h

diff --git a/src/object_properties.h b/src/object_properties.h
index 47698cff7620eb53cb70c55358ef08b36976a503..908757a644752d8fa0f29df058cd7ac35128df6d 100644 (file)
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -33,7 +33,7 @@ struct ObjectProperties
        bool physical;
        bool collideWithObjects;
        float weight;
-       core::aabbox3d<f32> collisionbox;
+       aabb3f collisionbox;
        std::string visual;
        std::string mesh;
        v2f visual_size;
@@ -51,6 +51,9 @@ struct ObjectProperties
        std::string nametag;
        video::SColor nametag_color;
        f32 automatic_face_movement_max_rotation_per_sec;
+       std::string infotext;
+       //! For dropped items, this contains item information.
+       std::string wield_item;
 
        ObjectProperties();
        std::string dump();