OS X compatibility fixes

[dragonfireclient.git] / src / serverlist.cpp

diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index 2c475cbc0d2aa58f2f00a5385f1465fd4c3d4f62..8a85b33b3d5511a83d755eaa3b6a48bdf83c14fa 100644 (file)
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -68,10 +68,9 @@ std::vector<ServerListSpec> getLocal()
 }
 
 
-#if USE_CURL
 std::vector<ServerListSpec> getOnline()
 {
-       Json::Value root = fetchJsonValue((g_settings->get("serverlist_url")+"/list").c_str(),0);
+       Json::Value root = fetchJsonValue((g_settings->get("serverlist_url")+"/list").c_str(), NULL);
 
        std::vector<ServerListSpec> serverlist;
 
@@ -87,8 +86,6 @@ std::vector<ServerListSpec> getOnline()
        return serverlist;
 }
 
-#endif
-
 /*
        Delete a server fromt he local favorites list
 */
@@ -218,7 +215,6 @@ void sendAnnounce(std::string action, const std::vector<std::string> & clients_n
                server["dedicated"]     = g_settings->get("server_dedicated");
                server["privs"]         = g_settings->get("default_privs");
                server["rollback"]      = g_settings->getBool("enable_rollback_recording");
-               server["liquid_finite"] = g_settings->getBool("liquid_finite");
                server["mapgen"]        = g_settings->get("mg_name");
                server["can_see_far_names"]     = g_settings->getBool("unlimited_player_transfer_distance");
                server["mods"]          = Json::Value(Json::arrayValue);
@@ -228,7 +224,7 @@ void sendAnnounce(std::string action, const std::vector<std::string> & clients_n
                actionstream << "announcing to " << g_settings->get("serverlist_url") << std::endl;
        } else {
                if (lag)
-                       server["step"]  = lag;
+                       server["lag"]   = lag;
        }
 
        Json::FastWriter writer;