Add dtime_s to entity activation

[dragonfireclient.git] / src / guiMainMenu.cpp

diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index ca0481e353228d7bebcb72809f9e207e18e334d3..5e0a3c38f303de7e1a60b3cfa27e812374c35f67 100644 (file)
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2010-12 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -36,9 +36,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 // For IGameCallback
 #include "guiPauseMenu.h"
 #include "gettext.h"
-#include "utility.h"
 #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;
@@ -214,11 +231,11 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                rect += m_topleft_client + v2s32(0, -30);
                gui::IGUITabControl *e = Environment->addTabControl(
                                rect, this, true, true, GUI_ID_TAB_CONTROL);
-               e->addTab(L"Singleplayer");
-               e->addTab(L"Multiplayer");
-               e->addTab(L"Advanced");
-               e->addTab(L"Settings");
-               e->addTab(L"Credits");
+               e->addTab(wgettext("Singleplayer"));
+               e->addTab(wgettext("Multiplayer"));
+               e->addTab(wgettext("Advanced"));
+               e->addTab(wgettext("Settings"));
+               e->addTab(wgettext("Credits"));
                e->setActiveTab(m_data->selected_tab);
        }
 #endif
@@ -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://c55.me/minetest/\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();
+}