minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Kahrl 2014-11-10 22:06:24 +01:00
parent a1e9732407
commit 0adadba218
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server.cpp
View File

@ -687,6 +687,7 @@ void Server::AsyncRunStep(bool initial_step)
m_env->getGameTime(),
m_lag,
m_gamespec.id,
m_emerge->params.mg_name,
m_mods);
counter = 0.01;
}

3
src/serverlist.cpp
View File

@ -194,6 +194,7 @@ void sendAnnounce(const std::string &action,
const u32 game_time,
const float lag,
const std::string &gameid,
const std::string &mg_name,
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");
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);

1
src/serverlist.h
View File

@ -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::string &mg_name = "",
const std::vector<ModSpec> &mods = std::vector<ModSpec>());
#endif
} // ServerList namespace