X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FguiPasswordChange.cpp;h=0e19f571d9881d9dd6e142b765032ec4b564fb57;hb=c7a78037809a2f9c431441f7ef91f84eb8744fff;hp=a4d16444da63abf4332463902a4c8f06bd0990e4;hpb=9e6376bd95ba9309365b39b878ab2f499776437a;p=dragonfireclient.git

diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp
index a4d16444d..0e19f571d 100644
--- a/src/guiPasswordChange.cpp
+++ b/src/guiPasswordChange.cpp
@@ -95,21 +95,20 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 
 	v2s32 size = rect.getSize();
 	v2s32 topleft_client(40, 0);
-	v2s32 size_client = size - v2s32(40, 0);
+
+	const wchar_t *text;
 
 	/*
 		Add stuff
 	*/
 	s32 ypos = 50;
-	changeCtype("");
 	{
-		core::rect<s32> rect(0, 0, 110, 20);
-		rect += topleft_client + v2s32(35, ypos+6);
-		wchar_t* text = wgettext("Old Password");
+		core::rect<s32> rect(0, 0, 150, 20);
+		rect += topleft_client + v2s32(25, ypos+6);
+		text = wgettext("Old Password");
 		Environment->addStaticText(text, rect, false, true, this, -1);
 		delete[] text;
 	}
-	changeCtype("C");
 	{
 		core::rect<s32> rect(0, 0, 230, 30);
 		rect += topleft_client + v2s32(160, ypos);
@@ -119,15 +118,13 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 		e->setPasswordBox(true);
 	}
 	ypos += 50;
-	changeCtype("");
 	{
-		core::rect<s32> rect(0, 0, 110, 20);
-		rect += topleft_client + v2s32(35, ypos+6);
-		wchar_t* text = wgettext("New Password");
+		core::rect<s32> rect(0, 0, 150, 20);
+		rect += topleft_client + v2s32(25, ypos+6);
+		text = wgettext("New Password");
 		Environment->addStaticText(text, rect, false, true, this, -1);
 		delete[] text;
 	}
-	changeCtype("C");
 	{
 		core::rect<s32> rect(0, 0, 230, 30);
 		rect += topleft_client + v2s32(160, ypos);
@@ -136,15 +133,13 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 		e->setPasswordBox(true);
 	}
 	ypos += 50;
-	changeCtype("");
 	{
-		core::rect<s32> rect(0, 0, 110, 20);
-		rect += topleft_client + v2s32(35, ypos+6);
-		wchar_t* text = wgettext("Confirm Password");
+		core::rect<s32> rect(0, 0, 150, 20);
+		rect += topleft_client + v2s32(25, ypos+6);
+		text = wgettext("Confirm Password");
 		Environment->addStaticText(text, rect, false, true, this, -1);
 		delete[] text;
 	}
-	changeCtype("C");
 	{
 		core::rect<s32> rect(0, 0, 230, 30);
 		rect += topleft_client + v2s32(160, ypos);
@@ -154,11 +149,10 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 	}
 
 	ypos += 50;
-	changeCtype("");
 	{
 		core::rect<s32> rect(0, 0, 140, 30);
 		rect = rect + v2s32(size.X/2-140/2, ypos);
-		wchar_t* text = wgettext("Change");
+		text = wgettext("Change");
 		Environment->addButton(rect, this, ID_change, text);
 		delete[] text;
 	}
@@ -167,7 +161,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 	{
 		core::rect<s32> rect(0, 0, 300, 20);
 		rect += topleft_client + v2s32(35, ypos);
-		wchar_t* text = wgettext("Passwords do not match!");
+		text = wgettext("Passwords do not match!");
 		IGUIElement *e = 
 		Environment->addStaticText(
 			text,
@@ -175,8 +169,6 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
 		e->setVisible(false);
 		delete[] text;
 	}
-	changeCtype("C");
-
 }
 
 void GUIPasswordChange::drawMenu()