X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fobject_properties.h;h=79866a22c4ba8949f639d7c34e80f3cded067b22;hb=refs%2Fheads%2Fmaster;hp=e8188cb604dbd96ca0c2a915573f9729fd549417;hpb=251e3e01c7350d94ea8dec0857e834d1ed84ac3f;p=dragonfireclient.git

diff --git a/src/object_properties.h b/src/object_properties.h
index e8188cb60..79866a22c 100644
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -17,41 +17,59 @@ 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"
 #include <iostream>
 #include <map>
 #include <vector>
+#include "util/Optional.h"
 
 struct ObjectProperties
 {
+	u16 hp_max = 1;
+	u16 breath_max = 0;
+	bool physical = false;
+	bool collideWithObjects = true;
 	// Values are BS=1
-	s16 hp_max;
-	bool physical;
-	bool collideWithObjects;
-	float weight;
-	core::aabbox3d<f32> collisionbox;
-	std::string visual;
-	std::string mesh;
-	v2f visual_size;
+	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 = "";
+	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 spritediv = v2s16(1, 1);
 	v2s16 initial_sprite_basepos;
-	bool is_visible;
-	bool makes_footstep_sound;
-	float automatic_rotate;
-	f32 stepheight;
-
+	bool is_visible = true;
+	bool makes_footstep_sound = false;
+	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);
+	Optional<video::SColor> nametag_bgcolor = nullopt;
+	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;
+	bool use_texture_alpha = false;
+	bool shaded = true;
+	bool show_on_minimap = false;
 
 	ObjectProperties();
 	std::string dump();
+	// check limits of some important properties (strings) that'd cause exceptions later on
+	bool validate();
 	void serialize(std::ostream &os) const;
 	void deSerialize(std::istream &is);
 };
-
-#endif
-