X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fplayer.h;h=93197d374a5ecff3573e2c3d2d115024fcdae503;hb=8852333eb3042580592ade478e5def20f8ed5d4c;hp=dce167438a71b7a39c18e7d0d0087cacee24df37;hpb=8b02a015eb7630c25e255ffe400bb714d023609b;p=oweals%2Fminetest.git

diff --git a/src/player.h b/src/player.h
index dce167438..93197d374 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,6 +89,7 @@ class IGameDef;
 struct CollisionInfo;
 class PlayerSAO;
 struct HudElement;
+class Environment;
 
 class Player
 {
@@ -96,7 +98,10 @@ public:
 	Player(IGameDef *gamedef);
 	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()
@@ -289,10 +294,17 @@ public:
 	
 	u32 keyPressed;
 	
-	std::vector<HudElement *> hud;
+
+	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;
 
@@ -309,6 +321,8 @@ protected:
 	v3f m_last_pos;
 	u16 m_last_hp;
 	Inventory m_last_inventory;
+
+	std::vector<HudElement *> hud;
 };
 
 
@@ -321,6 +335,8 @@ public:
 	RemotePlayer(IGameDef *gamedef): Player(gamedef), m_sao(0) {}
 	virtual ~RemotePlayer() {}
 
+	void save(std::string savedir);
+
 	PlayerSAO *getPlayerSAO()
 	{ return m_sao; }
 	void setPlayerSAO(PlayerSAO *sao)