Use fixed size for builtin menus on non-android platforms

[minetest.git] / src / serverlist.cpp

diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index 4d770a1c2fa559037124f81f3c80befd15bdff39..472a6b85c285cbc4acb2df56f2aebf249171071b 100644 (file)
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -189,16 +189,18 @@ const std::string serializeJson(const std::vector<ServerListSpec> &serverlist)
 
 #if USE_CURL
 void sendAnnounce(const std::string &action,
+               const u16 port,
                const std::vector<std::string> &clients_names,
                const double uptime,
                const u32 game_time,
                const float lag,
                const std::string &gameid,
+               const std::string &mg_name,
                const std::vector<ModSpec> &mods)
 {
        Json::Value server;
        server["action"] = action;
-       server["port"]    = g_settings->getU16("port");
+       server["port"] = port;
        if (g_settings->exists("server_address")) {
                server["address"] = g_settings->get("server_address");
        }
@@ -227,7 +229,7 @@ void sendAnnounce(const std::string &action,
        if (action == "start") {
                server["dedicated"]         = g_settings->getBool("server_dedicated");
                server["rollback"]          = g_settings->getBool("enable_rollback_recording");
-               server["mapgen"]            = g_settings->get("mg_name");
+               server["mapgen"]            = mg_name;
                server["privs"]             = g_settings->get("default_privs");
                server["can_see_far_names"] = g_settings->getS16("player_transfer_distance") <= 0;
                server["mods"]              = Json::Value(Json::arrayValue);