X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverlist.h;h=2b82b7431833404bc47df3fce078c0e60ff824f8;hb=323c8600450a5ae3893de9ba1d04095589c5b06c;hp=365e86beb6e4242ba2110fc40429c6e8ccb34a50;hpb=ac7a44792c77747e60beb1e8215fcd4976aa3b06;p=dragonfireclient.git

diff --git a/src/serverlist.h b/src/serverlist.h
index 365e86beb..2b82b7431 100644
--- a/src/serverlist.h
+++ b/src/serverlist.h
@@ -19,29 +19,34 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <iostream>
 #include "config.h"
-#include "mods.h"
-#include "json/json.h"
+#include "content/mods.h"
+#include <json/json.h>
 
-#ifndef SERVERLIST_HEADER
-#define SERVERLIST_HEADER
+#pragma once
 
 typedef Json::Value ServerListSpec;
 
 namespace ServerList
 {
-	std::vector<ServerListSpec> getLocal();
-	#if USE_CURL
-	std::vector<ServerListSpec> getOnline();
-	#endif
-	bool deleteEntry(ServerListSpec server);
-	bool insert(ServerListSpec server);
-	std::vector<ServerListSpec> deSerialize(std::string liststring);
-	std::string serialize(std::vector<ServerListSpec>);
-	std::vector<ServerListSpec> deSerializeJson(std::string liststring);
-	std::string serializeJson(std::vector<ServerListSpec>);
-	#if USE_CURL
-	void sendAnnounce(std::string action = "", u16 clients = 0, double uptime = 0, std::string gameid = "", std::vector<ModSpec> m_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