content_cao: Fix behavior of legacy "textures" field for wielditems

[minetest.git] / src / client / hud.h

diff --git a/src/client/hud.h b/src/client/hud.h
index cab115990d313a5ca6fa14ce2ab5d38ee313f88a..6f4c5462615887f4da55a812ebaaf6b8a7659778 100644 (file)
--- a/src/client/hud.h
+++ b/src/client/hud.h
@@ -18,8 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CLIENT_HUD_HEADER
-#define CLIENT_HUD_HEADER
+#pragma once
 
 #include <vector>
 #include <IGUIFont.h>
@@ -82,8 +81,9 @@ class Hud
 
 private:
        bool calculateScreenPos(const v3s16 &camera_offset, HudElement *e, v2s32 *pos);
-       void drawStatbar(v2s32 pos, u16 corner, u16 drawdir, const std::string &texture,
-                       s32 count, v2s32 offset, v2s32 size = v2s32());
+       void drawStatbar(v2s32 pos, u16 corner, u16 drawdir,
+                       const std::string &texture, const std::string& bgtexture,
+                       s32 count, s32 maxcount, v2s32 offset, v2s32 size = v2s32());
 
        void drawItems(v2s32 upperleftpos, v2s32 screen_offset, s32 itemcount,
                        s32 inv_offset, InventoryList *mainlist, u16 selectitem,
@@ -92,6 +92,7 @@ class Hud
        void drawItem(const ItemStack &item, const core::rect<s32> &rect, bool selected);
 
        float m_hud_scaling; // cached minetest setting
+       float m_scale_factor;
        v3s16 m_camera_offset;
        v2u32 m_screensize;
        v2s32 m_displaycenter;
@@ -146,4 +147,3 @@ void drawItemStack(
                const v3s16 &angle,
                const v3s16 &rotation_speed);
 
-#endif