Player eye height: Make this a settable player object property

[minetest.git] / src / object_properties.h

diff --git a/src/object_properties.h b/src/object_properties.h
index 772807fd994dae7f7f3773a1a40e97e105edc20d..8ccce589fc3634545526446cb0847e36764af747 100644 (file)
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef OBJECT_PROPERTIES_HEADER
-#define OBJECT_PROPERTIES_HEADER
+#pragma once
 
 #include <string>
 #include "irrlichttypes_bloated.h"
@@ -28,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);
@@ -43,22 +45,24 @@ struct ObjectProperties
        v2s16 initial_sprite_basepos;
        bool is_visible = true;
        bool makes_footstep_sound = false;
-       float automatic_rotate = 0.0f;
        f32 stepheight = 0.0f;
+       bool can_zoom = true;
+       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;
 
        ObjectProperties();
        std::string dump();
        void serialize(std::ostream &os) const;
        void deSerialize(std::istream &is);
 };
-
-#endif