1 files changed, 43 insertions, 43 deletions

diff --git a/src/content_sao.h b/src/content_sao.h
index bb1a61a19..0a1ae5ecf 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serverobject.h"
 #include "itemgroup.h"
 #include "object_properties.h"
+#include "constants.h"
 
 class UnitSAO: public ServerActiveObject
 {
@@ -56,31 +57,31 @@ public:
 	ObjectProperties* accessObjectProperties();
 	void notifyObjectPropertiesModified();
 protected:
-	s16 m_hp;
-	float m_yaw;
+	s16 m_hp = -1;
+	float m_yaw = 0.0f;
 
-	bool m_properties_sent;
+	bool m_properties_sent = true;
 	struct ObjectProperties m_prop;
 
 	ItemGroupList m_armor_groups;
-	bool m_armor_groups_sent;
+	bool m_armor_groups_sent = false;
 
 	v2f m_animation_range;
-	float m_animation_speed;
-	float m_animation_blend;
-	bool m_animation_loop;
-	bool m_animation_sent;
+	float m_animation_speed = 0.0f;
+	float m_animation_blend = 0.0f;
+	bool m_animation_loop = true;
+	bool m_animation_sent = false;
 
 	// Stores position and rotation for each bone name
 	std::unordered_map<std::string, core::vector2d<v3f>> m_bone_position;
-	bool m_bone_position_sent;
+	bool m_bone_position_sent = false;
 
-	int m_attachment_parent_id;
+	int m_attachment_parent_id = 0;
 	std::unordered_set<int> m_attachment_child_ids;
-	std::string m_attachment_bone;
+	std::string m_attachment_bone = "";
 	v3f m_attachment_position;
 	v3f m_attachment_rotation;
-	bool m_attachment_sent;
+	bool m_attachment_sent = false;
 };
 
 /*
@@ -133,17 +134,17 @@ private:
 
 	std::string m_init_name;
 	std::string m_init_state;
-	bool m_registered;
+	bool m_registered = false;
 
 	v3f m_velocity;
 	v3f m_acceleration;
 
-	float m_last_sent_yaw;
+	float m_last_sent_yaw = 0.0f;
 	v3f m_last_sent_position;
 	v3f m_last_sent_velocity;
-	float m_last_sent_position_timer;
-	float m_last_sent_move_precision;
-	std::string m_current_texture_modifier;
+	float m_last_sent_position_timer = 0.0f;
+	float m_last_sent_move_precision = 0.0f;
+	std::string m_current_texture_modifier = "";
 };
 
 /*
@@ -152,11 +153,10 @@ private:
 
 class LagPool
 {
-	float m_pool;
-	float m_max;
+	float m_pool = 15.0f;
+	float m_max = 15.0f;
 public:
-	LagPool(): m_pool(15), m_max(15)
-	{}
+	LagPool() {}
 
 	void setMax(float new_max)
 	{
@@ -368,47 +368,47 @@ private:
 	std::string getPropertyPacket();
 	void unlinkPlayerSessionAndSave();
 
-	RemotePlayer *m_player;
-	u16 m_peer_id;
-	Inventory *m_inventory;
-	s16 m_damage;
+	RemotePlayer *m_player = nullptr;
+	u16 m_peer_id = 0;
+	Inventory *m_inventory = nullptr;
+	s16 m_damage = 0;
 
 	// Cheat prevention
 	LagPool m_dig_pool;
 	LagPool m_move_pool;
 	v3f m_last_good_position;
-	float m_time_from_last_teleport;
-	float m_time_from_last_punch;
-	v3s16 m_nocheat_dig_pos;
-	float m_nocheat_dig_time;
+	float m_time_from_last_teleport = 0.0f;
+	float m_time_from_last_punch = 0.0f;
+	v3s16 m_nocheat_dig_pos = v3s16(32767, 32767, 32767);
+	float m_nocheat_dig_time = 0.0f;
 
 	// Timers
 	IntervalLimiter m_breathing_interval;
 	IntervalLimiter m_drowning_interval;
 	IntervalLimiter m_node_hurt_interval;
 
-	int m_wield_index;
-	bool m_position_not_sent;
+	int m_wield_index = 0;
+	bool m_position_not_sent = false;
 
 	// Cached privileges for enforcement
 	std::set<std::string> m_privs;
 	bool m_is_singleplayer;
 
-	u16 m_breath;
-	f32 m_pitch;
-	f32 m_fov;
-	s16 m_wanted_range;
+	u16 m_breath = PLAYER_MAX_BREATH;
+	f32 m_pitch = 0.0f;
+	f32 m_fov = 0.0f;
+	s16 m_wanted_range = 0.0f;
 
 	PlayerAttributes m_extra_attributes;
-	bool m_extended_attributes_modified;
+	bool m_extended_attributes_modified = false;
 public:
-	float m_physics_override_speed;
-	float m_physics_override_jump;
-	float m_physics_override_gravity;
-	bool m_physics_override_sneak;
-	bool m_physics_override_sneak_glitch;
-	bool m_physics_override_new_move;
-	bool m_physics_override_sent;
+	float m_physics_override_speed = 1.0f;
+	float m_physics_override_jump = 1.0f;
+	float m_physics_override_gravity = 1.0f;
+	bool m_physics_override_sneak = true;
+	bool m_physics_override_sneak_glitch = false;
+	bool m_physics_override_new_move = true;
+	bool m_physics_override_sent = false;
 };
 
 #endif