Allow full circle rotation with 2degs step for plantlike drawtype.

[oweals/minetest.git] / src / hud.cpp

diff --git a/src/hud.cpp b/src/hud.cpp
index f1d7a32584ca1b483a27472d0cdfb938d322cb0b..02071835f2b0b9c6a1aca92838ce0e8d2d3a65e6 100644 (file)
--- a/src/hud.cpp
+++ b/src/hud.cpp
@@ -33,6 +33,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 #include <IGUIStaticText.h>
 
+#ifdef HAVE_TOUCHSCREENGUI
+#include "touchscreengui.h"
+#endif
 
 Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr,
                gui::IGUIEnvironment* guienv, gui::IGUIFont *font,
@@ -50,6 +53,7 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr,
        m_screensize       = v2u32(0, 0);
        m_displaycenter    = v2s32(0, 0);
        m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE * porting::getDisplayDensity() + 0.5);
+       m_hotbar_imagesize *= g_settings->getFloat("gui_scaling");
        m_padding = m_hotbar_imagesize / 12;
 
        const video::SColor hbar_color(255, 255, 255, 255);
@@ -159,6 +163,11 @@ void Hud::drawItem(const ItemStack &item, const core::rect<s32>& rect, bool sele
 void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset,
                InventoryList *mainlist, u16 selectitem, u16 direction)
 {
+#ifdef HAVE_TOUCHSCREENGUI
+       if ( (g_touchscreengui) && (offset == 0))
+               g_touchscreengui->resetHud();
+#endif
+
        s32 height  = m_hotbar_imagesize + m_padding * 2;
        s32 width   = (itemcount - offset) * (m_hotbar_imagesize + m_padding * 2);
 
@@ -221,13 +230,18 @@ void Hud::drawItems(v2s32 upperleftpos, s32 itemcount, s32 offset,
                }
 
                drawItem(mainlist->getItem(i), (imgrect + pos + steppos), (i +1) == selectitem );
+
+#ifdef HAVE_TOUCHSCREENGUI
+               if (g_touchscreengui)
+                       g_touchscreengui->registerHudItem(i, (imgrect + pos + steppos));
+#endif
        }
 }
 
 
 void Hud::drawLuaElements(v3s16 camera_offset) {
-       for (size_t i = 0; i != player->hud.size(); i++) {
-               HudElement *e = player->hud[i];
+       for (size_t i = 0; i != player->maxHudId(); i++) {
+               HudElement *e = player->getHud(i);
                if (!e)
                        continue;
                
@@ -414,14 +428,27 @@ void Hud::drawHotbar(u16 playeritem) {
                        drawItems(secondpos, hotbar_itemcount, hotbar_itemcount/2, mainlist, playeritem + 1, 0);
                }
        }
+
+       //////////////////////////// compatibility code to be removed //////////////
+       // this is ugly as hell but there's no other way to keep compatibility to
+       // old servers
+       if ( player->hud_flags & HUD_FLAG_HEALTHBAR_VISIBLE)
+               drawStatbar(v2s32(floor(0.5 * (float) m_screensize.X + 0.5),
+                               floor(1 * (float) m_screensize.Y + 0.5)),
+                               HUD_CORNER_UPPER, 0, "heart.png",
+                               player->hp, v2s32((-10*24)-25,-(48+24+10)), v2s32(24,24));
+
+       if ((player->hud_flags & HUD_FLAG_BREATHBAR_VISIBLE) &&
+                       (player->getBreath() < 11))
+               drawStatbar(v2s32(floor(0.5 * (float) m_screensize.X + 0.5),
+                               floor(1 * (float) m_screensize.Y + 0.5)),
+                               HUD_CORNER_UPPER, 0, "heart.png",
+                               player->getBreath(), v2s32(25,-(48+24+10)), v2s32(24,24));
+       ////////////////////////////////////////////////////////////////////////////
 }
 
 
 void Hud::drawCrosshair() {
-       if (!(player->hud_flags & HUD_FLAG_CROSSHAIR_VISIBLE) ||
-                       (player->camera_mode == CAMERA_MODE_THIRD_FRONT)) {
-               return;
-       }
                
        if (use_crosshair_image) {
                video::ITexture *crosshair = tsrc->getTexture("crosshair.png");
@@ -452,6 +479,7 @@ void Hud::drawSelectionBoxes(std::vector<aabb3f> &hilightboxes) {
 void Hud::resizeHotbar() {
        if (m_screensize != porting::getWindowSize()) {
                m_hotbar_imagesize = floor(HOTBAR_IMAGE_SIZE * porting::getDisplayDensity() + 0.5);
+               m_hotbar_imagesize *= g_settings->getFloat("gui_scaling");
                m_padding = m_hotbar_imagesize / 12;
                m_screensize = porting::getWindowSize();
                m_displaycenter = v2s32(m_screensize.X/2,m_screensize.Y/2);