Merge remote-tracking branch 'origin/master'

1 files changed, 6 insertions, 2 deletions

diff --git a/src/hud.h b/src/hud.h
index 00e44dd80..fa9d33f8b 100644
--- a/src/hud.h
+++ b/src/hud.h
@@ -36,6 +36,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define HUD_FLAG_CROSSHAIR_VISIBLE (1 << 2)
 #define HUD_FLAG_WIELDITEM_VISIBLE (1 << 3)
 
+#define HUD_PARAM_HOTBAR_ITEMCOUNT 1
+
+#define HUD_HOTBAR_ITEMCOUNT_DEFAULT 8
+#define HUD_HOTBAR_ITEMCOUNT_MAX     23
+
 class Player;
 
 enum HudElementType {
@@ -46,7 +51,7 @@ enum HudElementType {
 };
 
 enum HudElementStat {
-	HUD_STAT_POS,
+	HUD_STAT_POS = 0,
 	HUD_STAT_NAME,
 	HUD_STAT_SCALE,
 	HUD_STAT_TEXT,
@@ -102,7 +107,6 @@ public:
 	v2u32 screensize;
 	v2s32 displaycenter;
 	s32 hotbar_imagesize;
-	s32 hotbar_itemcount;
 	
 	video::SColor crosshair_argb;
 	video::SColor selectionbox_argb;