diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
| commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
| tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/client/hud.h | |
| parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
| parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
| download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.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, 20 insertions, 12 deletions
diff --git a/src/client/hud.h b/src/client/hud.h index 818e3dea3..ba34d479d 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,8 +100,7 @@ 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]; @@ -133,13 +132,22 @@ 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); + |