VoxelArea: add_{x,y,z,p} must be static

[minetest.git] / src / object_properties.h

diff --git a/src/object_properties.h b/src/object_properties.h
index 116921f7d075f805fb5e2c7b03476e34b7bf3246..14077099845a671fed65432ef93cfc84eaf0068a 100644 (file)
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -27,12 +27,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct ObjectProperties
 {
-       // Values are BS=1
        s16 hp_max = 1;
+       u16 breath_max = 0;
        bool physical = false;
        bool collideWithObjects = true;
        float weight = 5.0f;
+       // Values are BS=1
        aabb3f collisionbox = aabb3f(-0.5f, -0.5f, -0.5f, 0.5f, 0.5f, 0.5f);
+       aabb3f selectionbox = aabb3f(-0.5f, -0.5f, -0.5f, 0.5f, 0.5f, 0.5f);
+       bool pointable = true;
        std::string visual = "sprite";
        std::string mesh = "";
        v2f visual_size = v2f(1, 1);
@@ -42,17 +45,21 @@ struct ObjectProperties
        v2s16 initial_sprite_basepos;
        bool is_visible = true;
        bool makes_footstep_sound = false;
-       float automatic_rotate = 0.0f;
        f32 stepheight = 0.0f;
+       float automatic_rotate = 0.0f;
        bool automatic_face_movement_dir = false;
        f32 automatic_face_movement_dir_offset = 0.0f;
        bool backface_culling = true;
+       s8 glow = 0;
        std::string nametag = "";
        video::SColor nametag_color = video::SColor(255, 255, 255, 255);
        f32 automatic_face_movement_max_rotation_per_sec = -1.0f;
        std::string infotext;
        //! For dropped items, this contains item information.
        std::string wield_item;
+       bool static_save = true;
+       float eye_height = 1.625f;
+       float zoom_fov = 0.0f;
 
        ObjectProperties();
        std::string dump();