diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-10-15 13:04:15 -0400 |
|---|---|---|
| committer | SmallJoker <mk939@ymail.com> | 2017-03-18 12:37:57 +0100 |
| commit | b8484ef24e8e1ec90a2967372808ab2bea538c7c (patch) | |
| tree | c70672297abb589b472f155421ac19a1f95de0e3 /src/serverlist.h | |
| parent | 2cc518dcaffd345c498f671354b3dd504f2f4195 (diff) | |
| download | minetest-b8484ef24e8e1ec90a2967372808ab2bea538c7c.tar.gz minetest-b8484ef24e8e1ec90a2967372808ab2bea538c7c.tar.bz2 minetest-b8484ef24e8e1ec90a2967372808ab2bea538c7c.zip | |
Server list cleanup
This removes the hacky server_dedicated pseudo-setting.
Diffstat (limited to 'src/serverlist.h')
| -rw-r--r-- | src/serverlist.h | 39 |
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 |