X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserverlist.h;h=4a0bd5efacef66b524cbd38b7f967dd174a20d58;hb=d82d18bfb1a51e0f2f0a89999474e98890addf7e;hp=bc40a1b3952c76c5b9e1e79f9f081e2271412a5a;hpb=9a39848ba93eaa56f7f62921f8de7a19e3ed0713;p=minetest.git

diff --git a/src/serverlist.h b/src/serverlist.h
index bc40a1b39..4a0bd5efa 100644
--- a/src/serverlist.h
+++ b/src/serverlist.h
@@ -19,29 +19,21 @@ 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
-
-typedef Json::Value ServerListSpec;
+#pragma once
 
 namespace ServerList
 {
-	std::vector<ServerListSpec> getLocal();
-	std::vector<ServerListSpec> getOnline();
-	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 = "", const std::vector<std::string> & clients_names = std::vector<std::string>(), 
-				double uptime = 0, u32 game_time = 0, float lag = 0, std::string gameid = "", 
-				std::vector<ModSpec> mods = std::vector<ModSpec>());
-	#endif
-} //ServerList namespace
-
+#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