Add note about --migrate only working with minetestserver or --server

[minetest.git] / src / guiPasswordChange.cpp

diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp
index 4ce1a3636a4aa938461ec9ef92eb3a5140f3a0af..8b55234c2a6b914ab9fd13fd14ee85200a2ce2e0 100644 (file)
--- a/src/guiPasswordChange.cpp
+++ b/src/guiPasswordChange.cpp
@@ -1,7 +1,7 @@
 /*
 Part of Minetest
 /*
 Part of Minetest

-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com>
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013 Ciaran Gultnieks <ciaran@ciarang.com>

 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above


@@ -95,7 +95,6 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 
        v2s32 size = rect.getSize();
        v2s32 topleft_client(40, 0);
 
        v2s32 size = rect.getSize();
        v2s32 topleft_client(40, 0);

-       v2s32 size_client = size - v2s32(40, 0);

 
        /*
                Add stuff
 
        /*
                Add stuff


@@ -105,8 +104,9 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);

-               Environment->addStaticText(wgettext("Old Password"),
-                       rect, false, true, this, -1);
+               wchar_t* text = wgettext("Old Password");
+               Environment->addStaticText(text, rect, false, true, this, -1);
+               delete[] text;

        }
        changeCtype("C");
        {
        }
        changeCtype("C");
        {


@@ -122,8 +122,9 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);

-               Environment->addStaticText(wgettext("New Password"),
-                       rect, false, true, this, -1);
+               wchar_t* text = wgettext("New Password");
+               Environment->addStaticText(text, rect, false, true, this, -1);
+               delete[] text;

        }
        changeCtype("C");
        {
        }
        changeCtype("C");
        {


@@ -138,8 +139,9 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);

-               Environment->addStaticText(wgettext("Confirm Password"),
-                       rect, false, true, this, -1);
+               wchar_t* text = wgettext("Confirm Password");
+               Environment->addStaticText(text, rect, false, true, this, -1);
+               delete[] text;

        }
        changeCtype("C");
        {
        }
        changeCtype("C");
        {


@@ -155,18 +157,22 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 140, 30);
                rect = rect + v2s32(size.X/2-140/2, ypos);
        {
                core::rect<s32> rect(0, 0, 140, 30);
                rect = rect + v2s32(size.X/2-140/2, ypos);

-               Environment->addButton(rect, this, ID_change, wgettext("Change"));
+               wchar_t* text = wgettext("Change");
+               Environment->addButton(rect, this, ID_change, text);
+               delete[] text;

        }
 
        ypos += 50;
        {
                core::rect<s32> rect(0, 0, 300, 20);
                rect += topleft_client + v2s32(35, ypos);
        }
 
        ypos += 50;
        {
                core::rect<s32> rect(0, 0, 300, 20);
                rect += topleft_client + v2s32(35, ypos);

+               wchar_t* text = wgettext("Passwords do not match!");

                IGUIElement *e = 
                Environment->addStaticText(
                IGUIElement *e = 
                Environment->addStaticText(

-                       wgettext("Passwords do not match!"),
+                       text,

                        rect, false, true, this, ID_message);
                e->setVisible(false);
                        rect, false, true, this, ID_message);
                e->setVisible(false);

+               delete[] text;

        }
        changeCtype("C");
 
        }
        changeCtype("C");