Fix possible NULL pointer access in MobV2CAO

[minetest.git] / src / guiMainMenu.cpp

diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index 707a96e3b79ede2f4885e1bb5b5d591962501b29..cf9b8eda42f658bf6e071d63d088d092a2e08efd 100644 (file)
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -22,7 +22,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "debug.h"
 #include "serialization.h"
 #include <string>
-
+#include <IGUICheckBox.h>
+#include <IGUIEditBox.h>
+#include <IGUIButton.h>
+#include <IGUIStaticText.h>
+#include <IGUIFont.h>
 
 
 #include "gettext.h"
@@ -164,6 +168,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        v2s32 topleft_client(40, 0);
        v2s32 size_client = size - v2s32(40, 0);
        
+       changeCtype("");
        {
                core::rect<s32> rect(0, 0, 20, 125);
                rect += topleft_client + v2s32(-15, 60);
@@ -177,8 +182,10 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, 50+6);
-               Environment->addStaticText(chartowchar_t(gettext("Name/Password")), rect, false, true, this, -1);
+               Environment->addStaticText(wgettext("Name/Password"), 
+                       rect, false, true, this, -1);
        }
+       changeCtype("C");
        {
                core::rect<s32> rect(0, 0, 230, 30);
                rect += topleft_client + v2s32(160, 50);
@@ -193,20 +200,25 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                gui::IGUIEditBox *e =
                Environment->addEditBox(L"", rect, true, this, 264);
                e->setPasswordBox(true);
+               if(text_name != L"" && text_address != L"")
+                       Environment->setFocus(e);
 
        }
+       changeCtype("");
        // Address + port
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, 100+6);
-               Environment->addStaticText(chartowchar_t(gettext("Address/Port")), rect, false, true, this, -1);
+               Environment->addStaticText(wgettext("Address/Port"),
+                       rect, false, true, this, -1);
        }
+       changeCtype("C");
        {
                core::rect<s32> rect(0, 0, 230, 30);
                rect += topleft_client + v2s32(160, 100);
                gui::IGUIElement *e = 
                Environment->addEditBox(text_address.c_str(), rect, true, this, GUI_ID_ADDRESS_INPUT);
-               if(text_name != L"")
+               if(text_name != L"" && text_address == L"")
                        Environment->setFocus(e);
        }
        {
@@ -215,29 +227,32 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                rect += topleft_client + v2s32(size_client.X-60-100, 100);
                Environment->addEditBox(text_port.c_str(), rect, true, this, GUI_ID_PORT_INPUT);
        }
+       changeCtype("");
        {
                core::rect<s32> rect(0, 0, 400, 20);
                rect += topleft_client + v2s32(160, 100+35);
-               Environment->addStaticText(chartowchar_t(gettext("Leave address blank to start a local server.")), rect, false, true, this, -1);
+               Environment->addStaticText(wgettext("Leave address blank to start a local server."),
+                       rect, false, true, this, -1);
        }
        {
                core::rect<s32> rect(0, 0, 250, 30);
                rect += topleft_client + v2s32(35, 150);
                Environment->addCheckBox(fancy_trees, rect, this, GUI_ID_FANCYTREE_CB,
-                       chartowchar_t(gettext("Fancy trees"))); 
+                       wgettext("Fancy trees")); 
        }
        {
                core::rect<s32> rect(0, 0, 250, 30);
                rect += topleft_client + v2s32(35, 150+30);
                Environment->addCheckBox(smooth_lighting, rect, this, GUI_ID_SMOOTH_LIGHTING_CB,
-                               chartowchar_t(gettext("Smooth Lighting")));
+                               wgettext("Smooth Lighting"));
        }
        // Start game button
        {
                core::rect<s32> rect(0, 0, 180, 30);
                //rect += topleft_client + v2s32(size_client.X/2-180/2, 225-30/2);
                rect += topleft_client + v2s32(size_client.X-180-40, 150+25);
-               Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON, chartowchar_t(gettext("Start Game / Connect")));
+               Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON,
+                       wgettext("Start Game / Connect"));
        }
 
        // Key change button
@@ -245,7 +260,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                core::rect<s32> rect(0, 0, 100, 30);
                //rect += topleft_client + v2s32(size_client.X/2-180/2, 225-30/2);
                rect += topleft_client + v2s32(size_client.X-180-40-100-20, 150+25);
-               Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON, chartowchar_t(gettext("Change keys")));
+               Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON,
+                       wgettext("Change keys"));
        }
        /*
                Server section
@@ -267,20 +283,24 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 250, 30);
                rect += topleft_server + v2s32(35, 30);
-               Environment->addCheckBox(creative_mode, rect, this, GUI_ID_CREATIVE_CB, chartowchar_t(gettext("Creative Mode")));
+               Environment->addCheckBox(creative_mode, rect, this, GUI_ID_CREATIVE_CB,
+                       wgettext("Creative Mode"));
        }
        {
                core::rect<s32> rect(0, 0, 250, 30);
                rect += topleft_server + v2s32(35, 60);
-               Environment->addCheckBox(enable_damage, rect, this, GUI_ID_DAMAGE_CB, chartowchar_t(gettext("Enable Damage")));
+               Environment->addCheckBox(enable_damage, rect, this, GUI_ID_DAMAGE_CB,
+                       wgettext("Enable Damage"));
        }
        // Map delete button
        {
                core::rect<s32> rect(0, 0, 130, 30);
                //rect += topleft_server + v2s32(size_server.X-40-130, 100+25);
                rect += topleft_server + v2s32(40, 100+25);
-               Environment->addButton(rect, this, GUI_ID_DELETE_MAP_BUTTON, chartowchar_t(gettext("Delete map")));
+               Environment->addButton(rect, this, GUI_ID_DELETE_MAP_BUTTON,
+                         wgettext("Delete map"));
        }
+       changeCtype("C");
 }
 
 void GUIMainMenu::drawMenu()