Fix backwards compatibility issue introduced by close_on_enter

[dragonfireclient.git] / src / guiVolumeChange.cpp

diff --git a/src/guiVolumeChange.cpp b/src/guiVolumeChange.cpp
index cfb89da1cf8c307759d9b958279068b8627504a7..c8e257f7f1c1a104d56dfb6ba33430fc99f0ec42 100644 (file)
--- a/src/guiVolumeChange.cpp
+++ b/src/guiVolumeChange.cpp
@@ -26,7 +26,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <IGUIScrollBar.h>
 #include <IGUIStaticText.h>
 #include <IGUIFont.h>
-#include "main.h"
+#include "settings.h"
 
 #include "gettext.h"
 
@@ -40,8 +40,7 @@ GUIVolumeChange::GUIVolumeChange(gui::IGUIEnvironment* env,
                IMenuManager *menumgr,
                Client* client
 ):
-       GUIModalMenu(env, parent, id, menumgr),
-       m_client(client)
+       GUIModalMenu(env, parent, id, menumgr)
 {
 }
 
@@ -96,17 +95,17 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
 
        v2s32 size = rect.getSize();
        v2s32 topleft_client(40, 0);
-       v2s32 size_client = size - v2s32(40, 0);
        int volume=(int)(g_settings->getFloat("sound_volume")*100);
        /*
                Add stuff
        */
-       changeCtype("");
        {
                core::rect<s32> rect(0, 0, 120, 20);
                rect = rect + v2s32(size.X/2-60, size.Y/2-35);
-               Environment->addStaticText(wgettext("Sound Volume: "), rect, false,
+               const wchar_t *text = wgettext("Sound Volume: ");
+               Environment->addStaticText(text, rect, false,
                                true, this, ID_soundText1);
+               delete[] text;
        }
        {
                core::rect<s32> rect(0, 0, 30, 20);
@@ -117,8 +116,10 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 80, 30);
                rect = rect + v2s32(size.X/2-80/2, size.Y/2+55);
+               const wchar_t *text = wgettext("Exit");
                Environment->addButton(rect, this, ID_soundExitButton,
-                       wgettext("Exit"));
+                       text);
+               delete[] text;
        }
        {
                core::rect<s32> rect(0, 0, 300, 20);
@@ -128,7 +129,6 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
                e->setMax(100);
                e->setPos(volume);
        }
-       changeCtype("");
 }
 
 void GUIVolumeChange::drawMenu()