Send a on_receive_fields event when formspec is closed, with fields.quit = "true"

[dragonfireclient.git] / src / hud.cpp

diff --git a/src/hud.cpp b/src/hud.cpp
index de34b9d645fd262744760c37689463a228c57592..183f94e4905140d2402c19dbdb04143755bbecd7 100644 (file)
--- a/src/hud.cpp
+++ b/src/hud.cpp
@@ -234,13 +234,16 @@ void Hud::drawLuaElements() {
                                const video::SColor color(255, 255, 255, 255);
                                const video::SColor colors[] = {color, color, color, color};
                                core::dimension2di imgsize(texture->getOriginalSize());
-                               core::rect<s32> rect(0, 0, imgsize.Width  * e->scale.X,
-                                                                              imgsize.Height * e->scale.X);
-                               rect += pos;
-                               v2s32 offset((e->align.X - 1.0) * ((imgsize.Width  * e->scale.X) / 2),
-                                            (e->align.Y - 1.0) * ((imgsize.Height * e->scale.X) / 2));
-                               rect += offset;
-                               rect += v2s32(e->offset.X, e->offset.Y);
+                               v2s32 dstsize(imgsize.Width * e->scale.X,
+                                             imgsize.Height * e->scale.Y);
+                               if (e->scale.X < 0)
+                                       dstsize.X = screensize.X * (e->scale.X * -0.01);
+                               if (e->scale.Y < 0)
+                                       dstsize.Y = screensize.Y * (e->scale.Y * -0.01);
+                               v2s32 offset((e->align.X - 1.0) * dstsize.X / 2,
+                                            (e->align.Y - 1.0) * dstsize.Y / 2);
+                               core::rect<s32> rect(0, 0, dstsize.X, dstsize.Y);
+                               rect += pos + offset + v2s32(e->offset.X, e->offset.Y);
                                driver->draw2DImage(texture, rect,
                                        core::rect<s32>(core::position2d<s32>(0,0), imgsize),
                                        NULL, colors, true);
@@ -337,7 +340,7 @@ void Hud::drawHotbar(v2s32 centerlowerpos, s32 halfheartcount, u16 playeritem, s
        s32 hotbar_itemcount = player->hud_hotbar_itemcount;
        s32 padding = hotbar_imagesize / 12;
        s32 width = hotbar_itemcount * (hotbar_imagesize + padding * 2);
-       v2s32 pos = centerlowerpos - v2s32(width / 2, hotbar_imagesize + padding * 2);
+       v2s32 pos = centerlowerpos - v2s32(width / 2, hotbar_imagesize + padding * 3);
        
        if (player->hud_flags & HUD_FLAG_HOTBAR_VISIBLE)
                drawItem(pos, hotbar_imagesize, hotbar_itemcount, mainlist, playeritem + 1, 0);