Revert "Fix short 180 degree rotation when using set_bone_position (#10405)" (#10534)

[dragonfireclient.git] / src / object_properties.h

diff --git a/src/object_properties.h b/src/object_properties.h
index 3175e61181326cf47a289813797a45b579d9c106..adb483527e28c84cb39e0aae02010a8a9d19de50 100644 (file)
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -27,11 +27,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct ObjectProperties
 {
-       s16 hp_max = 1;
+       u16 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);
@@ -40,6 +39,7 @@ struct ObjectProperties
        std::string mesh = "";
        v3f visual_size = v3f(1, 1, 1);
        std::vector<std::string> textures;
+       std::string damage_texture_modifier = "^[brighten";
        std::vector<video::SColor> colors;
        v2s16 spritediv = v2s16(1, 1);
        v2s16 initial_sprite_basepos;
@@ -61,6 +61,8 @@ struct ObjectProperties
        float eye_height = 1.625f;
        float zoom_fov = 0.0f;
        bool use_texture_alpha = false;
+       bool shaded = true;
+       bool show_on_minimap = false;
 
        ObjectProperties();
        std::string dump();