No longer auto-generate a 'guest####' player name when name is empty

You can't join most servers with a 'guest####' player name anyway so
it's only logical to remove them.

diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index 6145e3ddef379aa044fe56a08a5141748ba997dd..1ac67a1decb9f714817eabc25c1054a09cbceec3 100644 (file)
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -403,11 +403,12 @@ bool ClientLauncher::launch_game(std::string &error_message,
                return false;
        }
 
-       if (menudata.name == "")
-               menudata.name = std::string("Guest") + itos(myrand_range(1000, 9999));
-       else
-               playername = menudata.name;
+       if (menudata.name == "" && !simple_singleplayer_mode) {
+               error_message = gettext("Please choose a name!");
+               return false;
+       }
 
+       playername = menudata.name;
        password = menudata.password;
 
        g_settings->set("name", playername);