Fix alpha for liquid nodes (#5494)

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

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index ab93aeca17a63413e7dab43a075a528a18b78c6f..64642cf1fdd327b3944b0743cbfce3a3d9c4bf78 100644 (file)
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -42,7 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "gettime.h"
 #include "gettext.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
 #include "porting.h"
 #include "settings.h"
 #include "client.h"
@@ -1770,10 +1770,11 @@ void GUIFormSpecMenu::parseAnchor(parserData *data, const std::string &element)
                return;
        }
 
-       errorstream << "Invalid anchor element (" << parts.size() << "): '" << element << "'" << std::endl;
+       errorstream << "Invalid anchor element (" << parts.size() << "): '" << element
+                       << "'" << std::endl;
 }
 
-void GUIFormSpecMenu::parseElement(parserData* data, std::string element)
+void GUIFormSpecMenu::parseElement(parserData* data, const std::string &element)
 {
        //some prechecks
        if (element == "")
@@ -2663,9 +2664,9 @@ void GUIFormSpecMenu::drawMenu()
                        m_old_tooltip = L"";
                } else {
                        if (id == m_old_tooltip_id) {
-                               delta = porting::getDeltaMs(m_hovered_time, getTimeMs());
+                               delta = porting::getDeltaMs(m_hovered_time, porting::getTimeMs());
                        } else {
-                               m_hovered_time = getTimeMs();
+                               m_hovered_time = porting::getTimeMs();
                                m_old_tooltip_id = id;
                        }
                }
@@ -3243,10 +3244,10 @@ bool GUIFormSpecMenu::DoubleClickDetection(const SEvent event)
                m_doubleclickdetect[0].time = m_doubleclickdetect[1].time;
 
                m_doubleclickdetect[1].pos  = m_pointer;
-               m_doubleclickdetect[1].time = getTimeMs();
+               m_doubleclickdetect[1].time = porting::getTimeMs();
        }
        else if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP) {
-               u32 delta = porting::getDeltaMs(m_doubleclickdetect[0].time, getTimeMs());
+               u32 delta = porting::getDeltaMs(m_doubleclickdetect[0].time, porting::getTimeMs());
                if (delta > 400) {
                        return false;
                }