X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fplayer.h;h=435875233b45250368eae095f84292de4c56a0a2;hb=a1e9732407494edb9cef3ada45cc2781a34ed60c;hp=fc80769c2cfeb233740a3a4369dadefac537c386;hpb=49f6e347f01f72e8854308d5a54aaae337489555;p=dragonfireclient.git

diff --git a/src/player.h b/src/player.h
index fc80769c2..435875233 100644
--- a/src/player.h
+++ b/src/player.h
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_bloated.h"
 #include "inventory.h"
 #include "constants.h" // BS
+#include <list>
 
 #define PLAYERNAME_SIZE 20
 
@@ -88,15 +89,19 @@ class IGameDef;
 struct CollisionInfo;
 class PlayerSAO;
 struct HudElement;
+class Environment;
 
 class Player
 {
 public:
 
-	Player(IGameDef *gamedef);
+	Player(IGameDef *gamedef, const char *name);
 	virtual ~Player() = 0;
 
-	virtual void move(f32 dtime, Map &map, f32 pos_max_d)
+	virtual void move(f32 dtime, Environment *env, f32 pos_max_d)
+	{}
+	virtual void move(f32 dtime, Environment *env, f32 pos_max_d,
+			std::list<CollisionInfo> *collision_info)
 	{}
 
 	v3f getSpeed()
@@ -137,16 +142,22 @@ class Player
 
 	virtual void setPosition(const v3f &position)
 	{
+		if (position != m_position)
+			m_dirty = true;
 		m_position = position;
 	}
 
 	void setPitch(f32 pitch)
 	{
+		if (pitch != m_pitch)
+			m_dirty = true;
 		m_pitch = pitch;
 	}
 
 	virtual void setYaw(f32 yaw)
 	{
+		if (yaw != m_yaw)
+			m_dirty = true;
 		m_yaw = yaw;
 	}
 
@@ -160,6 +171,18 @@ class Player
 		return m_yaw;
 	}
 
+	u16 getBreath()
+	{
+		return m_breath;
+	}
+
+	virtual void setBreath(u16 breath)
+	{
+		if (breath != m_breath)
+			m_dirty = true;
+		m_breath = breath;
+	}
+
 	f32 getRadPitch()
 	{
 		return -1.0 * m_pitch * core::DEGTORAD;
@@ -170,16 +193,24 @@ class Player
 		return (m_yaw + 90.) * core::DEGTORAD;
 	}
 
-	void updateName(const char *name)
-	{
-		snprintf(m_name, PLAYERNAME_SIZE, "%s", name);
-	}
-
 	const char * getName() const
 	{
 		return m_name;
 	}
 
+	core::aabbox3d<f32> getCollisionbox() {
+		return m_collisionbox;
+	}
+
+	u32 getFreeHudID() const {
+		size_t size = hud.size();
+		for (size_t i = 0; i != size; i++) {
+			if (!hud[i])
+				return i;
+		}
+		return size;
+	}
+
 	virtual bool isLocal() const
 	{ return false; }
 	virtual PlayerSAO *getPlayerSAO()
@@ -193,7 +224,19 @@ class Player
 		deSerialize stops reading exactly at the right point.
 	*/
 	void serialize(std::ostream &os);
-	void deSerialize(std::istream &is);
+	void deSerialize(std::istream &is, std::string playername);
+
+	bool checkModified() const
+	{
+		return m_dirty || inventory.checkModified();
+	}
+
+	void setModified(const bool x)
+	{
+		m_dirty = x;
+		if (x == false)
+			inventory.setModified(x);
+	}
 
 	bool touching_ground;
 	// This oscillates so that the player jumps a bit above the surface
@@ -206,8 +249,6 @@ class Player
 	bool swimming_vertical;
 	bool camera_barely_in_ceiling;
 	
-	u8 light;
-
 	Inventory inventory;
 
 	f32 movement_acceleration_default;
@@ -226,6 +267,11 @@ class Player
 	float physics_override_speed;
 	float physics_override_jump;
 	float physics_override_gravity;
+	bool physics_override_sneak;
+	bool physics_override_sneak_glitch;
+
+	v2s32 local_animations[4];
+	float local_animation_speed;
 
 	u16 hp;
 
@@ -233,7 +279,7 @@ class Player
 	float hurt_tilt_strength;
 
 	u16 peer_id;
-	
+
 	std::string inventory_formspec;
 	
 	PlayerControl control;
@@ -243,41 +289,49 @@ class Player
 	}
 	
 	u32 keyPressed;
+	
 
-	std::map<u32, HudElement*> hud;
-	std::map<u8, u32> hud_bars;
+	HudElement* getHud(u32 id);
+	u32         addHud(HudElement* hud);
+	HudElement* removeHud(u32 id);
+	void        clearHud();
+	u32         maxHudId() {
+		return hud.size();
+	}
 
+	u32 hud_flags;
+	s32 hud_hotbar_itemcount;
 protected:
 	IGameDef *m_gamedef;
 
 	char m_name[PLAYERNAME_SIZE];
+	u16 m_breath;
 	f32 m_pitch;
 	f32 m_yaw;
 	v3f m_speed;
 	v3f m_position;
-};
+	core::aabbox3d<f32> m_collisionbox;
 
-struct HudElement {
-	u8 type;
-	core::vector2df pos;
-	std::string name;
+	bool m_dirty;
 
-	core::vector2df scale;
-	std::string text;
-	u32 number;
-	u32 item;
-	u32 dir;
+	std::vector<HudElement *> hud;
 };
 
+
 /*
 	Player on the server
 */
 class RemotePlayer : public Player
 {
 public:
-	RemotePlayer(IGameDef *gamedef): Player(gamedef), m_sao(0) {}
+	RemotePlayer(IGameDef *gamedef, const char *name):
+		Player(gamedef, name),
+		m_sao(NULL)
+	{}
 	virtual ~RemotePlayer() {}
 
+	void save(std::string savedir);
+
 	PlayerSAO *getPlayerSAO()
 	{ return m_sao; }
 	void setPlayerSAO(PlayerSAO *sao)