Serverlist: announce mg_name from map_meta.txt instead of minetest.conf

diff --git a/src/server.cpp b/src/server.cpp
index 7be1f5860c25751d71bece9c437ae8d647c1d07a..2694f1bbe7e99e6f2701fd36fd90ab7d027dd095 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -687,6 +687,7 @@ void Server::AsyncRunStep(bool initial_step)
                                        m_env->getGameTime(),
                                        m_lag,
                                        m_gamespec.id,
                                        m_env->getGameTime(),
                                        m_lag,
                                        m_gamespec.id,

+                                       m_emerge->params.mg_name,

                                        m_mods);
                        counter = 0.01;
                }
                                        m_mods);
                        counter = 0.01;
                }

diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index 4d770a1c2fa559037124f81f3c80befd15bdff39..65c75fec23c6c3cdf2ee01f8e34e5de0901a168f 100644 (file)
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -194,6 +194,7 @@ void sendAnnounce(const std::string &action,
                const u32 game_time,
                const float lag,
                const std::string &gameid,
                const u32 game_time,
                const float lag,
                const std::string &gameid,

+               const std::string &mg_name,

                const std::vector<ModSpec> &mods)
 {
        Json::Value server;
                const std::vector<ModSpec> &mods)
 {
        Json::Value server;


@@ -227,7 +228,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");
        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);
                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);

diff --git a/src/serverlist.h b/src/serverlist.h
index aa3f1d6104f6d31a2bcc7a78580cf82245b17958..7a7461ebdaef6421c0b57e2a0429d98364dd47c5 100644 (file)
--- a/src/serverlist.h
+++ b/src/serverlist.h
@@ -42,6 +42,7 @@ namespace ServerList
                        const std::vector<std::string> &clients_names = std::vector<std::string>(),
                        const double uptime = 0, const u32 game_time = 0,
                        const float lag = 0, const std::string &gameid = "",
                        const std::vector<std::string> &clients_names = std::vector<std::string>(),
                        const double uptime = 0, const u32 game_time = 0,
                        const float lag = 0, const std::string &gameid = "",

+                       const std::string &mg_name = "",

                        const std::vector<ModSpec> &mods = std::vector<ModSpec>());
        #endif
 } // ServerList namespace
                        const std::vector<ModSpec> &mods = std::vector<ModSpec>());
        #endif
 } // ServerList namespace