diff options
| author | Matthew I <matttpt@gmail.com> | 2012-09-02 16:51:17 -0400 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-09-05 01:17:28 +0300 |
| commit | 5dd1d354f86692e4c08cc78f3d9743557103449e (patch) | |
| tree | 1668bdb85e11e7c5faa93a8c59b47a828e4eadad /src/guiMainMenu.cpp | |
| parent | a0da6bcf43d71d22b949ccf1e68153b51da53e39 (diff) | |
| download | minetest-5dd1d354f86692e4c08cc78f3d9743557103449e.tar.xz | |
Enforce stricter world names using a blacklist
Blacklisted characters are: / \
Diffstat (limited to 'src/guiMainMenu.cpp')
| -rw-r--r-- | src/guiMainMenu.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index cdf1bc7d5..4ceecbb5f 100644 --- 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,7 +48,10 @@ struct CreateWorldDestMainMenu : public CreateWorldDest {} void accepted(std::wstring name, std::string gameid) { - m_menu->createNewWorld(name, gameid); + if(!string_allowed_blacklist(wide_to_narrow(name), WORLDNAME_BLACKLISTED_CHARS)) + m_menu->displayMessageMenu(wgettext("Cannot create world: Name contains invalid characters")); + else + m_menu->createNewWorld(name, gameid); } GUIMainMenu *m_menu; }; @@ -929,3 +933,7 @@ int GUIMainMenu::getTab() return TAB_SINGLEPLAYER; // Default } +void GUIMainMenu::displayMessageMenu(std::wstring msg) +{ + (new GUIMessageMenu(env, parent, -1, menumgr, msg))->drop(); +}
\ No newline at end of file |