Extex101
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent world creation if the world already exists

master
Matthew I 2012-08-30 15:41:48 -04:00 committed by Perttu Ahola
parent 5dd1d354f8
commit c8895dd43b
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/guiMainMenu.cpp
View File

@ -48,10 +48,23 @@ struct CreateWorldDestMainMenu : public CreateWorldDest
{} {}
void accepted(std::wstring name, std::string gameid) void accepted(std::wstring name, std::string gameid)
{ {
if(!string_allowed_blacklist(wide_to_narrow(name), WORLDNAME_BLACKLISTED_CHARS)) 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")); m_menu->displayMessageMenu(wgettext("Cannot create world: Name contains invalid characters"));
else return;
m_menu->createNewWorld(name, gameid); }
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; GUIMainMenu *m_menu;
}; };
@ -936,4 +949,4 @@ int GUIMainMenu::getTab()
void GUIMainMenu::displayMessageMenu(std::wstring msg) void GUIMainMenu::displayMessageMenu(std::wstring msg)
{ {
(new GUIMessageMenu(env, parent, -1, menumgr, msg))->drop(); (new GUIMessageMenu(env, parent, -1, menumgr, msg))->drop();
} }