Added network protocol version number in protocol

[dragonfireclient.git] / src / guiMainMenu.cpp

diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index f557f4dc08eeb0c14fe6bd0a56f97900fa975e73..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);
@@ -217,13 +219,15 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        }
        {
                core::rect<s32> rect(0, 0, 400, 20);
-               Environment->addStaticText(chartowchar_t(gettext("Leave address blank to start a local server.")), rect, false, true, this, -1);
+               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);
        }
        {
                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);
@@ -236,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
@@ -244,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
@@ -266,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")));
        }
 }