From 49f6e347f01f72e8854308d5a54aaae337489555 Mon Sep 17 00:00:00 2001
From: Jonathon Anderson <anderjon@umail.iu.edu>
Date: Thu, 11 Apr 2013 13:23:38 -0500
Subject: Lua HUD

---
 src/player.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/player.h')

diff --git a/src/player.h b/src/player.h
index d95e535ff..fc80769c2 100644
--- a/src/player.h
+++ b/src/player.h
@@ -87,6 +87,7 @@ class Map;
 class IGameDef;
 struct CollisionInfo;
 class PlayerSAO;
+struct HudElement;
 
 class Player
 {
@@ -243,6 +244,9 @@ public:
 	
 	u32 keyPressed;
 
+	std::map<u32, HudElement*> hud;
+	std::map<u8, u32> hud_bars;
+
 protected:
 	IGameDef *m_gamedef;
 
@@ -253,6 +257,18 @@ protected:
 	v3f m_position;
 };
 
+struct HudElement {
+	u8 type;
+	core::vector2df pos;
+	std::string name;
+
+	core::vector2df scale;
+	std::string text;
+	u32 number;
+	u32 item;
+	u32 dir;
+};
+
 /*
 	Player on the server
 */
-- 
cgit v1.2.3


From 666aae359310483b7ad0f2bba1f4c31d8a58c737 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sat, 13 Apr 2013 18:20:22 -0400
Subject: Split HUD code off to hud.cpp, make into a class, extensive Lua HUD
 modification

---
 src/player.h | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'src/player.h')

diff --git a/src/player.h b/src/player.h
index fc80769c2..d0e50d2c3 100644
--- a/src/player.h
+++ b/src/player.h
@@ -87,7 +87,7 @@ class Map;
 class IGameDef;
 struct CollisionInfo;
 class PlayerSAO;
-struct HudElement;
+class HudElement;
 
 class Player
 {
@@ -243,9 +243,8 @@ public:
 	}
 	
 	u32 keyPressed;
-
-	std::map<u32, HudElement*> hud;
-	std::map<u8, u32> hud_bars;
+	
+	std::vector<HudElement *> hud;
 
 protected:
 	IGameDef *m_gamedef;
@@ -257,17 +256,6 @@ protected:
 	v3f m_position;
 };
 
-struct HudElement {
-	u8 type;
-	core::vector2df pos;
-	std::string name;
-
-	core::vector2df scale;
-	std::string text;
-	u32 number;
-	u32 item;
-	u32 dir;
-};
 
 /*
 	Player on the server
-- 
cgit v1.2.3