diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/client/hud.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/client/hud.h')
| -rw-r--r-- | src/client/hud.h | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/src/client/hud.h b/src/client/hud.h index ba34d479d..818e3dea3 100644 --- a/src/client/hud.h +++ b/src/client/hud.h @@ -85,9 +85,9 @@ public: private: bool calculateScreenPos(const v3s16 &camera_offset, HudElement *e, v2s32 *pos); - 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 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, @@ -100,7 +100,8 @@ private: v3s16 m_camera_offset; v2u32 m_screensize; v2s32 m_displaycenter; - s32 m_hotbar_imagesize; // Takes hud_scaling into account, updated by resizeHotbar() + s32 m_hotbar_imagesize; // Takes hud_scaling into account, updated by + // resizeHotbar() s32 m_padding; // Takes hud_scaling into account, updated by resizeHotbar() video::SColor hbar_colors[4]; @@ -132,22 +133,13 @@ enum ItemRotationKind IT_ROT_NONE, // Must be last, also serves as number }; -void drawItemStack(video::IVideoDriver *driver, - gui::IGUIFont *font, - const ItemStack &item, - const core::rect<s32> &rect, - const core::rect<s32> *clip, - Client *client, +void drawItemStack(video::IVideoDriver *driver, gui::IGUIFont *font, + const ItemStack &item, const core::rect<s32> &rect, + const core::rect<s32> *clip, Client *client, ItemRotationKind rotation_kind); -void drawItemStack( - video::IVideoDriver *driver, - gui::IGUIFont *font, - const ItemStack &item, - const core::rect<s32> &rect, - const core::rect<s32> *clip, - Client *client, - ItemRotationKind rotation_kind, - const v3s16 &angle, +void drawItemStack(video::IVideoDriver *driver, gui::IGUIFont *font, + const ItemStack &item, const core::rect<s32> &rect, + const core::rect<s32> *clip, Client *client, + ItemRotationKind rotation_kind, const v3s16 &angle, const v3s16 &rotation_speed); - |