Add dtime_s to entity activation

[dragonfireclient.git] / src / guiMainMenu.cpp

diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index 8517d2723ce989625216c09a8c673f8176fb84a5..5e0a3c38f303de7e1a60b3cfa27e812374c35f67 100644 (file)
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -39,6 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "tile.h" // getTexturePath
 #include "filesys.h"
 #include "util/string.h"
+#include "subgame.h"
 
 struct CreateWorldDestMainMenu : public CreateWorldDest
 {
@@ -47,6 +48,22 @@ struct CreateWorldDestMainMenu : public CreateWorldDest
        {}
        void accepted(std::wstring name, std::string gameid)
        {
+               std::string name_narrow = wide_to_narrow(name);
+               if(!string_allowed_blacklist(name_narrow, WORLDNAME_BLACKLISTED_CHARS))
+               {
+                       m_menu->displayMessageMenu(wgettext("Cannot create world: Name contains invalid characters"));
+                       return;
+               }
+               std::vector<WorldSpec> worlds = getAvailableWorlds();
+               for(std::vector<WorldSpec>::iterator i = worlds.begin();
+                   i != worlds.end(); i++)
+               {
+                       if((*i).name == name_narrow)
+                       {
+                               m_menu->displayMessageMenu(wgettext("Cannot create world: A world by this name already exists"));
+                               return;
+                       }
+               }
                m_menu->createNewWorld(name, gameid);
        }
        GUIMainMenu *m_menu;
@@ -586,14 +603,14 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                        t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
                }
                {
-                       core::rect<s32> rect(0, 0, 620, 250);
-                       rect += m_topleft_client + v2s32(130+14, 50+35);
+                       core::rect<s32> rect(0, 0, 454, 250);
+                       rect += m_topleft_client + v2s32(110, 50+35);
                        Environment->addStaticText(narrow_to_wide(
                        "Minetest-c55 " VERSION_STRING "\n"
                        "http://minetest.net/\n"
                        "\n"
                        "by Perttu Ahola <celeron55@gmail.com>\n"
-                       "and contributors"
+                       "and contributors: tango_, kahrl (kaaaaaahrl?), erlehmann (the hippie), SpeedProg, JacobF (sqlite worlds), teddydestodes, marktraceur, darkrose, Jonathan Neuschäfer (who the hell?), Felix Krausse (broke liquids, IIRC), sfan5... and >10 more random people."
                        ).c_str(), rect, false, true, this, -1);
                }
        }
@@ -929,3 +946,7 @@ int GUIMainMenu::getTab()
        return TAB_SINGLEPLAYER; // Default
 }
 
+void GUIMainMenu::displayMessageMenu(std::wstring msg)
+{
+       (new GUIMessageMenu(env, parent, -1, menumgr, msg))->drop();
+}