Client-side autojump. Remove Android-only stepheight autojump (#7228)

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

diff --git a/src/gui/guiEngine.cpp b/src/gui/guiEngine.cpp
index 00c3f85bcfa62eb09043440e810a60c958a19209..67ab6437d27ba64bf5a56199b675ef44dcefb4d4 100644 (file)
--- a/src/gui/guiEngine.cpp
+++ b/src/gui/guiEngine.cpp
@@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "guiMainMenu.h"
 #include "sound.h"
-#include "sound_openal.h"
+#include "client/sound_openal.h"
 #include "clouds.h"
 #include "httpfetch.h"
 #include "log.h"
@@ -137,7 +137,8 @@ GUIEngine::GUIEngine(JoystickController *joystick,
        //create soundmanager
        MenuMusicFetcher soundfetcher;
 #if USE_SOUND
-       m_sound_manager = createOpenALSoundManager(g_sound_manager_singleton.get(), &soundfetcher);
+       if (g_settings->getBool("enable_sound"))
+               m_sound_manager = createOpenALSoundManager(g_sound_manager_singleton.get(), &soundfetcher);
 #endif
        if(!m_sound_manager)
                m_sound_manager = &dummySoundManager;
@@ -164,6 +165,7 @@ GUIEngine::GUIEngine(JoystickController *joystick,
                        m_texture_source,
                        m_formspecgui,
                        m_buttonhandler,
+                       "",
                        false);
 
        m_menu->allowClose(false);