summaryrefslogtreecommitdiff
path: root/src/serverlist.h
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2017-06-03 14:55:10 -0400
committerShadowNinja <shadowninja@minetest.net>2017-06-03 14:55:10 -0400
commitcaecdb681c428c1aab9c0f7eec2570c0460f995c (patch)
treee5115982ea59bbf2343ba9b35bc4a0cfbb56f407 /src/serverlist.h
parent81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (diff)
parent80dc961d24e1964e25d57039ddb2ba639f9f4d22 (diff)
downloadminetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.gz
minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.bz2
minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.zip
Merge 0.4.16 into stable-0.4
Diffstat (limited to 'src/serverlist.h')
-rw-r--r--src/serverlist.h39
1 files changed, 22 insertions, 17 deletions
diff --git a/src/serverlist.h b/src/serverlist.h
index 0747c3920..079026199 100644
--- a/src/serverlist.h
+++ b/src/serverlist.h
@@ -29,22 +29,27 @@ typedef Json::Value ServerListSpec;
namespace ServerList
{
- std::vector<ServerListSpec> getLocal();
- std::vector<ServerListSpec> getOnline();
- bool deleteEntry(const ServerListSpec &server);
- bool insert(const ServerListSpec &server);
- std::vector<ServerListSpec> deSerialize(const std::string &liststring);
- const std::string serialize(const std::vector<ServerListSpec> &serverlist);
- std::vector<ServerListSpec> deSerializeJson(const std::string &liststring);
- 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 = 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
+std::vector<ServerListSpec> getLocal();
+std::vector<ServerListSpec> getOnline();
+
+bool deleteEntry(const ServerListSpec &server);
+bool insert(const ServerListSpec &server);
+
+std::vector<ServerListSpec> deSerialize(const std::string &liststring);
+const std::string serialize(const std::vector<ServerListSpec> &serverlist);
+std::vector<ServerListSpec> deSerializeJson(const std::string &liststring);
+const std::string serializeJson(const std::vector<ServerListSpec> &serverlist);
+
+#if USE_CURL
+enum AnnounceAction {AA_START, AA_UPDATE, AA_DELETE};
+void sendAnnounce(AnnounceAction, u16 port,
+ const std::vector<std::string> &clients_names = std::vector<std::string>(),
+ double uptime = 0, u32 game_time = 0, float lag = 0,
+ const std::string &gameid = "", const std::string &mg_name = "",
+ const std::vector<ModSpec> &mods = std::vector<ModSpec>(),
+ bool dedicated = false);
+#endif
+
+} // namespace ServerList
#endif