From d3f0ce62240b7598eded13153eacb410bf2420a1 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Thu, 25 Apr 2013 19:27:22 -0400 Subject: Generalize hud_builtin_enable into hud_set_flags --- src/hud.h | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'src/hud.h') diff --git a/src/hud.h b/src/hud.h index e0d7ccd6f..405e91176 100644 --- a/src/hud.h +++ b/src/hud.h @@ -31,10 +31,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #define HUD_CORNER_LOWER 1 #define HUD_CORNER_CENTER 2 -#define HUD_DRAW_HOTBAR (1 << 0) -#define HUD_DRAW_HEALTHBAR (1 << 1) -#define HUD_DRAW_CROSSHAIR (1 << 2) -#define HUD_DRAW_WIELDITEM (1 << 3) +#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) class Player; @@ -71,14 +71,6 @@ struct HudElement { }; -enum HudBuiltinElement { - HUD_BUILTIN_HOTBAR = 0, - HUD_BUILTIN_HEALTHBAR, - HUD_BUILTIN_CROSSHAIR, - HUD_BUILTIN_WIELDITEM -}; - - inline u32 hud_get_free_id(Player *player) { size_t size = player->hud.size(); for (size_t i = 0; i != size; i++) { @@ -123,9 +115,10 @@ public: void drawItem(v2s32 upperleftpos, s32 imgsize, s32 itemcount, InventoryList *mainlist, u16 selectitem, u16 direction); void drawLuaElements(); - void drawStatbar(v2s32 pos, u16 corner, u16 drawdir, std::string texture, s32 count, v2s32 offset); + void drawStatbar(v2s32 pos, u16 corner, u16 drawdir, + std::string texture, s32 count, v2s32 offset); - void drawHotbar(v2s32 centerlowerpos, s32 halfheartcount, u16 playeritem, u32 flags); + void drawHotbar(v2s32 centerlowerpos, s32 halfheartcount, u16 playeritem); void resizeHotbar(); void drawCrosshair(); -- cgit v1.2.3