X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fobject_properties.h;h=14077099845a671fed65432ef93cfc84eaf0068a;hb=4be46aeeb17c42718ecea14934e24d77772b4126;hp=a18c8a1bb3e1fad56009f53cbb2d6184261f6812;hpb=ac4884c3d677ef51bcce47f95ccd49d874022692;p=dragonfireclient.git diff --git a/src/object_properties.h b/src/object_properties.h index a18c8a1bb..140770998 100644 --- a/src/object_properties.h +++ b/src/object_properties.h @@ -27,11 +27,12 @@ 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; @@ -44,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();