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

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

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 910a0a6b77c98bab887655f79f8449f84723b4e4..d6ca12b707ef23e256de7e5b030bf805fa6cd086 100644 (file)
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -621,8 +621,8 @@ void GUIFormSpecMenu::parseItemImage(parserData* data,std::string element)
                pos.Y += stof(v_pos[1]) * (float) spacing.Y;
 
                v2s32 geom;
-               geom.X = stoi(v_geom[0]) * (float)imgsize.X;
-               geom.Y = stoi(v_geom[1]) * (float)imgsize.Y;
+               geom.X = stof(v_geom[0]) * (float)imgsize.X;
+               geom.Y = stof(v_geom[1]) * (float)imgsize.Y;
 
                if(data->bp_set != 2)
                        errorstream<<"WARNING: invalid use of item_image without a size[] element"<<std::endl;
@@ -2350,16 +2350,19 @@ void GUIFormSpecMenu::drawMenu()
 
        if (hovered != NULL) {
                s32 id = hovered->getID();
+               u32 delta;
                if (id == -1) {
                        m_old_tooltip_id = id;
                        m_old_tooltip = "";
+                       delta = 0;
                } else if (id != m_old_tooltip_id) {
                        m_hoovered_time = getTimeMs();
                        m_old_tooltip_id = id;
+                       delta = 0;
                } else if (id == m_old_tooltip_id) {
-                       u32 delta = porting::getDeltaMs(m_hoovered_time, getTimeMs());
-                       if (delta <= m_tooltip_show_delay)
-                               goto skip_tooltip;
+                       delta = porting::getDeltaMs(m_hoovered_time, getTimeMs());
+               }
+               if (id != -1 && delta >= m_tooltip_show_delay) {
                        for(std::vector<FieldSpec>::iterator iter =  m_fields.begin();
                                        iter != m_fields.end(); iter++) {
                                if ( (iter->fid == id) && (m_tooltips[iter->fname].tooltip != "") ){
@@ -2392,7 +2395,6 @@ void GUIFormSpecMenu::drawMenu()
                }
        }
 
-       skip_tooltip:
        /*
                Draw dragged item stack
        */