Footsteps: Fix offset footstep and shallow water sound bugs

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

diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index 84bc8488ea83f5cb0c2b34d32b4f8c7c59483265..03fee6b967e4c712f959b15d706b40a4960a8f6b 100644 (file)
--- a/src/guiEngine.cpp
+++ b/src/guiEngine.cpp
@@ -37,6 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "fontengine.h"
 #include "guiscalingfilter.h"
+#include "irrlicht_changes/static_text.h"
 
 #ifdef __ANDROID__
 #include "client/tile.h"
@@ -130,6 +131,7 @@ void MenuMusicFetcher::fetchSounds(const std::string &name,
 /** GUIEngine                                                                 */
 /******************************************************************************/
 GUIEngine::GUIEngine(  irr::IrrlichtDevice* dev,
+                                               JoystickController *joystick,
                                                gui::IGUIElement* parent,
                                                IMenuManager *menumgr,
                                                scene::ISceneManager* smgr,
@@ -172,30 +174,29 @@ GUIEngine::GUIEngine(     irr::IrrlichtDevice* dev,
                m_sound_manager = &dummySoundManager;
 
        //create topleft header
-       std::wstring t = utf8_to_wide(std::string(PROJECT_NAME_C " ") +
-                       g_version_hash);
+       m_toplefttext = L"";
 
-       core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(t), g_fontengine->getTextHeight());
+       core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(m_toplefttext.c_str()),
+               g_fontengine->getTextHeight());
        rect += v2s32(4, 0);
 
        m_irr_toplefttext =
-               m_device->getGUIEnvironment()->addStaticText(t.c_str(),
-               rect,false,true,0,-1);
+               addStaticText(m_device->getGUIEnvironment(), m_toplefttext,
+                       rect, false, true, 0, -1);
 
        //create formspecsource
        m_formspecgui = new FormspecFormSource("");
 
        /* Create menu */
        m_menu = new GUIFormSpecMenu(m_device,
+                       joystick,
                        m_parent,
                        -1,
                        m_menumanager,
                        NULL /* &client */,
-                       NULL /* gamedef */,
                        m_texture_source,
                        m_formspecgui,
                        m_buttonhandler,
-                       NULL,
                        false);
 
        m_menu->allowClose(false);
@@ -212,13 +213,13 @@ GUIEngine::GUIEngine(     irr::IrrlichtDevice* dev,
                m_data->script_data.errormessage = "";
 
                if (!loadMainMenuScript()) {
-                       errorstream << "No future without mainmenu" << std::endl;
+                       errorstream << "No future without main menu!" << std::endl;
                        abort();
                }
 
                run();
        } catch (LuaError &e) {
-               errorstream << "MAINMENU ERROR: " << e.what() << std::endl;
+               errorstream << "Main menu error: " << e.what() << std::endl;
                m_data->script_data.errormessage = e.what();
        }
 
@@ -230,13 +231,13 @@ GUIEngine::GUIEngine(     irr::IrrlichtDevice* dev,
 /******************************************************************************/
 bool GUIEngine::loadMainMenuScript()
 {
-       // Try custom menu script (main_menu_path)
-
+       // Set main menu path (for core.get_mainmenu_path())
        m_scriptdir = g_settings->get("main_menu_path");
        if (m_scriptdir.empty()) {
-               m_scriptdir = porting::path_share + DIR_DELIM "builtin" + DIR_DELIM "mainmenu";
+               m_scriptdir = porting::path_share + DIR_DELIM + "builtin" + DIR_DELIM + "mainmenu";
        }
 
+       // Load builtin (which will load the main menu script)
        std::string script = porting::path_share + DIR_DELIM "builtin" + DIR_DELIM "init.lua";
        try {
                m_script->loadScript(script);
@@ -361,7 +362,7 @@ void GUIEngine::cloudPreProcess()
 /******************************************************************************/
 void GUIEngine::cloudPostProcess()
 {
-       float fps_max = g_settings->getFloat("fps_max");
+       float fps_max = g_settings->getFloat("pause_fps_max");
        // Time of frame without fps limit
        u32 busytime_u32;
 
@@ -430,7 +431,7 @@ void GUIEngine::drawOverlay(video::IVideoDriver* driver)
 
        video::ITexture* texture = m_textures[TEX_LAYER_OVERLAY].texture;
 
-       /* If no texture, draw background of solid color */
+       /* If no texture, draw nothing */
        if(!texture)
                return;
 
@@ -459,7 +460,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver)
        v2s32 splashsize(((f32)texture->getOriginalSize().Width) * mult,
                        ((f32)texture->getOriginalSize().Height) * mult);
 
-       // Don't draw the header is there isn't enough room
+       // Don't draw the header if there isn't enough room
        s32 free_space = (((s32)screensize.Height)-320)/2;
 
        if (free_space > splashsize.Y) {
@@ -567,18 +568,9 @@ bool GUIEngine::downloadFile(std::string url, std::string target)
 }
 
 /******************************************************************************/
-void GUIEngine::setTopleftText(std::string append)
+void GUIEngine::setTopleftText(const std::string &text)
 {
-       std::wstring toset = utf8_to_wide(std::string(PROJECT_NAME_C " ") +
-               g_version_hash);
-
-       if (append != "")
-       {
-               toset += L" / ";
-               toset += utf8_to_wide(append);
-       }
-
-       m_irr_toplefttext->setText(toset.c_str());
+       m_toplefttext = utf8_to_wide(text);
 
        updateTopLeftTextSize();
 }
@@ -586,15 +578,14 @@ void GUIEngine::setTopleftText(std::string append)
 /******************************************************************************/
 void GUIEngine::updateTopLeftTextSize()
 {
-       std::wstring text = m_irr_toplefttext->getText();
-
-       core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(text), g_fontengine->getTextHeight());
-               rect += v2s32(4, 0);
+       core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(m_toplefttext.c_str()),
+               g_fontengine->getTextHeight());
+       rect += v2s32(4, 0);
 
        m_irr_toplefttext->remove();
        m_irr_toplefttext =
-               m_device->getGUIEnvironment()->addStaticText(text.c_str(),
-               rect,false,true,0,-1);
+               addStaticText(m_device->getGUIEnvironment(), m_toplefttext,
+                       rect, false, true, 0, -1);
 }
 
 /******************************************************************************/