changed some lines to fit the 80chars limit

diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index 707a96e3b79ede2f4885e1bb5b5d591962501b29..1d7f224f614fa3bf3af6be185414f09fbd7f85f5 100644 (file)
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -177,7 +177,8 @@ 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(chartowchar_t(gettext("Name/Password")), 
+                       rect, false, true, this, -1);
        }
        {
                core::rect<s32> rect(0, 0, 230, 30);
@@ -199,7 +200,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        {
                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(chartowchar_t(gettext("Address/Port")),
+                       rect, false, true, this, -1);
        }
        {
                core::rect<s32> rect(0, 0, 230, 30);
@@ -218,13 +220,14 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        {
                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(chartowchar_t(gettext("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"))); 
+                       chartowchar_t(gettext("Fancy trees"))); 
        }
        {
                core::rect<s32> rect(0, 0, 250, 30);
@@ -237,7 +240,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                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,
+                       chartowchar_t(gettext("Start Game / Connect")));
        }
 
        // Key change button
@@ -245,7 +249,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,
+                       chartowchar_t(gettext("Change keys")));
        }
        /*
                Server section
@@ -267,19 +272,22 @@ 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,
+                       chartowchar_t(gettext("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,
+                       chartowchar_t(gettext("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,
+                         chartowchar_t(gettext("Delete map")));
        }
 }
 

diff --git a/src/guiMessageMenu.cpp b/src/guiMessageMenu.cpp
index e4e582ab176f35dcfa31041d1a145e04330fc908..155be6029c8b0f08174a121e8bb50c4d44617853 100644 (file)
--- a/src/guiMessageMenu.cpp
+++ b/src/guiMessageMenu.cpp
@@ -89,7 +89,8 @@ void GUIMessageMenu::regenerateGui(v2u32 screensize)
                core::rect<s32> rect(0, 0, 140, 30);
                rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
                gui::IGUIElement *e = 
-               Environment->addButton(rect, this, 257, chartowchar_t(gettext("Proceed")));
+               Environment->addButton(rect, this, 257,
+                       chartowchar_t(gettext("Proceed")));
                Environment->setFocus(e);
        }
 }

diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp
index 79601a99fb5724cd60f238f7c12c7f34b366b65e..fabe7511013d8ccd56394c1626859793b4a19d3e 100644 (file)
--- a/src/guiPasswordChange.cpp
+++ b/src/guiPasswordChange.cpp
@@ -99,7 +99,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);
-               Environment->addStaticText(chartowchar_t(gettext("Old Password")), rect, false, true, this, -1);
+               Environment->addStaticText(chartowchar_t(gettext("Old Password")),
+                       rect, false, true, this, -1);
        }
        {
                core::rect<s32> rect(0, 0, 230, 30);
@@ -113,7 +114,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);
-               Environment->addStaticText(chartowchar_t(gettext("New Password")), rect, false, true, this, -1);
+               Environment->addStaticText(chartowchar_t(gettext("New Password")),
+                       rect, false, true, this, -1);
        }
        {
                core::rect<s32> rect(0, 0, 230, 30);
@@ -126,7 +128,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 110, 20);
                rect += topleft_client + v2s32(35, ypos+6);
-               Environment->addStaticText(chartowchar_t(gettext("Confirm Password")), rect, false, true, this, -1);
+               Environment->addStaticText(chartowchar_t(gettext("Confirm Password")),
+                       rect, false, true, this, -1);
        }
        {
                core::rect<s32> rect(0, 0, 230, 30);
@@ -148,7 +151,9 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
                core::rect<s32> rect(0, 0, 300, 20);
                rect += topleft_client + v2s32(35, ypos);
                IGUIElement *e = 
-               Environment->addStaticText(chartowchar_t(gettext("Passwords do not match!")), rect, false, true, this, ID_message);
+               Environment->addStaticText(
+                       chartowchar_t(gettext("Passwords do not match!")),
+                       rect, false, true, this, ID_message);
                e->setVisible(false);
        }
 

diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp
index 5f40a4820462decaea4dad57a86c502c470a1cac..61485518c0d3dcdadbb94be03c854c53b6bdbe4d 100644 (file)
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -106,25 +106,29 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
        {\r
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
-               Environment->addButton(rect, this, 256, chartowchar_t(gettext("Continue")));\r
+               Environment->addButton(rect, this, 256,\r
+                       chartowchar_t(gettext("Continue")));\r
        }\r
        btn_y += btn_height + btn_gap;\r
        {\r
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
-               Environment->addButton(rect, this, 261, chartowchar_t(gettext("Change Password")));\r
+               Environment->addButton(rect, this, 261,\r
+                       chartowchar_t(gettext("Change Password")));\r
        }\r
        btn_y += btn_height + btn_gap;\r
        {\r
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
-               Environment->addButton(rect, this, 260, chartowchar_t(gettext("Disconnect")));\r
+               Environment->addButton(rect, this, 260,\r
+                       chartowchar_t(gettext("Disconnect")));\r
        }\r
        btn_y += btn_height + btn_gap;\r
        {\r
                core::rect<s32> rect(0, 0, 140, btn_height);\r
                rect = rect + v2s32(size.X/2-140/2, btn_y);\r
-               Environment->addButton(rect, this, 257, chartowchar_t(gettext("Exit to OS")));\r
+               Environment->addButton(rect, this, 257,\r
+                       chartowchar_t(gettext("Exit to OS")));\r
        }\r
 \r
        {\r

diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index b15f8bc07354dc922ce448dc10fda9afec77393d..252e452f5d30f690c86c24abd2340b51c506c613 100644 (file)
--- a/src/guiTextInputMenu.cpp
+++ b/src/guiTextInputMenu.cpp
@@ -107,7 +107,8 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
        {
                core::rect<s32> rect(0, 0, 140, 30);
                rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
-               Environment->addButton(rect, this, 257, chartowchar_t(gettext("Proceed")));
+               Environment->addButton(rect, this, 257,
+                       chartowchar_t(gettext("Proceed")));
        }
 }