From 6ccb5835ff55d85156be91473c598eca9d6cb9a6 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Wed, 4 Nov 2020 16:57:41 +0100 Subject: Revert "Make Lint Happy" This reverts commit ad148587dcf5244c2d2011dba339786c765c54c4. --- src/client/hud.h | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'src/client/hud.h') 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 &rect, - const core::rect *clip, Client *client, +void drawItemStack(video::IVideoDriver *driver, + gui::IGUIFont *font, + const ItemStack &item, + const core::rect &rect, + const core::rect *clip, + Client *client, ItemRotationKind rotation_kind); -void drawItemStack(video::IVideoDriver *driver, gui::IGUIFont *font, - const ItemStack &item, const core::rect &rect, - const core::rect *clip, Client *client, - ItemRotationKind rotation_kind, const v3s16 &angle, +void drawItemStack( + video::IVideoDriver *driver, + gui::IGUIFont *font, + const ItemStack &item, + const core::rect &rect, + const core::rect *clip, + Client *client, + ItemRotationKind rotation_kind, + const v3s16 &angle, const v3s16 &rotation_speed); + -- cgit v1.2.3