X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fhud.h;h=e015baec125fbf9dfe6334a52944c89937097aa6;hb=1780adeea63630e67f4af8b300f6ae710d9af486;hp=1ace6646fd91f99aa0dceef30dd01e7e4d4dd8a1;hpb=6f511b1d05d3e1668967a528b77a9e81e31b3c78;p=dragonfireclient.git

diff --git a/src/hud.h b/src/hud.h
index 1ace6646f..e015baec1 100644
--- a/src/hud.h
+++ b/src/hud.h
@@ -1,6 +1,7 @@
 /*
 Minetest
 Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2017 red-001 <red-001@outlook.ie>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -17,11 +18,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef HUD_HEADER
-#define HUD_HEADER
+#pragma once
 
 #include "irrlichttypes_extrabloated.h"
 #include <string>
+#include "common/c_types.h"
 
 #define HUD_DIR_LEFT_RIGHT 0
 #define HUD_DIR_RIGHT_LEFT 1
@@ -32,18 +33,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define HUD_CORNER_LOWER  1
 #define HUD_CORNER_CENTER 2
 
-#define HUD_FLAG_HOTBAR_VISIBLE    (1 << 0)
-#define HUD_FLAG_HEALTHBAR_VISIBLE (1 << 1)
-#define HUD_FLAG_CROSSHAIR_VISIBLE (1 << 2)
-#define HUD_FLAG_WIELDITEM_VISIBLE (1 << 3)
-#define HUD_FLAG_BREATHBAR_VISIBLE (1 << 4)
+// Note that these visibility flags do not determine if the hud items are
+// actually drawn, but rather, whether to draw the item should the rest
+// of the game state permit it.
+#define HUD_FLAG_HOTBAR_VISIBLE        (1 << 0)
+#define HUD_FLAG_HEALTHBAR_VISIBLE     (1 << 1)
+#define HUD_FLAG_CROSSHAIR_VISIBLE     (1 << 2)
+#define HUD_FLAG_WIELDITEM_VISIBLE     (1 << 3)
+#define HUD_FLAG_BREATHBAR_VISIBLE     (1 << 4)
+#define HUD_FLAG_MINIMAP_VISIBLE       (1 << 5)
+#define HUD_FLAG_MINIMAP_RADAR_VISIBLE (1 << 6)
 
 #define HUD_PARAM_HOTBAR_ITEMCOUNT 1
 #define HUD_PARAM_HOTBAR_IMAGE 2
 #define HUD_PARAM_HOTBAR_SELECTED_IMAGE 3
 
 #define HUD_HOTBAR_ITEMCOUNT_DEFAULT 8
-#define HUD_HOTBAR_ITEMCOUNT_MAX     23
+#define HUD_HOTBAR_ITEMCOUNT_MAX     32
 
 
 #define HOTBAR_IMAGE_SIZE 48
@@ -54,6 +60,7 @@ enum HudElementType {
 	HUD_ELEM_STATBAR   = 2,
 	HUD_ELEM_INVENTORY = 3,
 	HUD_ELEM_WAYPOINT  = 4,
+	HUD_ELEM_IMAGE_WAYPOINT = 5
 };
 
 enum HudElementStat {
@@ -66,7 +73,10 @@ enum HudElementStat {
 	HUD_STAT_DIR,
 	HUD_STAT_ALIGN,
 	HUD_STAT_OFFSET,
-	HUD_STAT_WORLD_POS
+	HUD_STAT_WORLD_POS,
+	HUD_STAT_SIZE,
+	HUD_STAT_Z_INDEX,
+	HUD_STAT_TEXT2,
 };
 
 struct HudElement {
@@ -81,76 +91,12 @@ struct HudElement {
 	v2f align;
 	v2f offset;
 	v3f world_pos;
+	v2s32 size;
+	s16 z_index = 0;
+	std::string text2;
 };
 
-#ifndef SERVER
-
-#include <vector>
-#include <IGUIFont.h>
-#include "irr_aabb3d.h"
-
-class IGameDef;
-class ITextureSource;
-class Inventory;
-class InventoryList;
-class LocalPlayer;
-struct ItemStack;
-
-class Hud {
-public:
-	video::IVideoDriver *driver;
-	scene::ISceneManager* smgr;
-	gui::IGUIEnvironment *guienv;
-	gui::IGUIFont *font;
-	u32 text_height;
-	IGameDef *gamedef;
-	LocalPlayer *player;
-	Inventory *inventory;
-	ITextureSource *tsrc;
-
-	video::SColor crosshair_argb;
-	video::SColor selectionbox_argb;
-	bool use_crosshair_image;
-	std::string hotbar_image;
-	bool use_hotbar_image;
-	std::string hotbar_selected_image;
-	bool use_hotbar_selected_image;
-	v3s16 camera_offset;
-	
-	Hud(video::IVideoDriver *driver,scene::ISceneManager* smgr,
-		gui::IGUIEnvironment* guienv, gui::IGUIFont *font,
-		u32 text_height, IGameDef *gamedef,
-		LocalPlayer *player, Inventory *inventory);
-	
-	void drawHotbar(s32 halfheartcount, u16 playeritem, s32 breath);
-	void resizeHotbar();
-	void drawCrosshair();
-	void drawSelectionBoxes(std::vector<aabb3f> &hilightboxes);
-	void drawLuaElements(v3s16 camera_offset);
-private:
-	void drawStatbar(v2s32 pos, u16 corner, u16 drawdir,
-					 std::string texture, s32 count, v2s32 offset);
-	
-	void drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset,
-		InventoryList *mainlist, u16 selectitem, u16 direction);
-
-	void drawItem(const ItemStack &item, const core::rect<s32>& rect, bool selected);
-	
-	v2u32 m_screensize;
-	v2s32 m_displaycenter;
-	s32 m_hotbar_imagesize;
-	s32 m_padding;
-	video::SColor hbar_colors[4];
-};
-
-void drawItemStack(video::IVideoDriver *driver,
-		gui::IGUIFont *font,
-		const ItemStack &item,
-		const core::rect<s32> &rect,
-		const core::rect<s32> *clip,
-		IGameDef *gamedef);
-
-
-#endif
+extern const EnumString es_HudElementType[];
+extern const EnumString es_HudElementStat[];
+extern const EnumString es_HudBuiltinElement[];
 
-#endif