From b682d69e494acdbf5fc97a81109faa667ad1918f Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sun, 13 Jun 2021 22:16:41 -0500 Subject: Use new HTTP-based master server client --- include/aoapplication.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'include/aoapplication.h') diff --git a/include/aoapplication.h b/include/aoapplication.h index 835c7fd9..d0d5121e 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -61,7 +61,6 @@ public: void ms_packet_received(AOPacket *p_packet); void server_packet_received(AOPacket *p_packet); - void send_ms_packet(AOPacket *p_packet); void send_server_packet(AOPacket *p_packet, bool encoded = true); void call_settings_menu(); @@ -119,7 +118,7 @@ public: QVector &get_favorite_list() { return favorite_list; } void add_favorite_server(int p_server); - void set_server_list(); + void set_server_list(QVector &servers) { server_list = servers; } QVector &get_server_list() { return server_list; } // reads the theme from config.ini and sets it accordingly @@ -528,9 +527,6 @@ private: QVector server_list; QVector favorite_list; -private slots: - void ms_connect_finished(bool connected, bool will_retry); - public slots: void server_disconnected(); void loading_cancelled(); -- cgit From f1107aeac51658a0525d4231b2f1f39131acbcb5 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 18 Dec 2021 20:29:55 -0600 Subject: Finish out feature - Add periodic timer for heartbeat - Add option to settings for opting out from heartbeat/player metrics - Change base URL to permanent URL --- include/aoapplication.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/aoapplication.h') diff --git a/include/aoapplication.h b/include/aoapplication.h index d0d5121e..1cdcbc54 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -491,6 +491,9 @@ public: // Get the default scaling method QString get_default_scaling(); + // Get whether to opt out of player count metrics sent to the master server + bool get_player_count_optout(); + // Currently defined subtheme QString subtheme; -- cgit From e29a41b58ffdcaaa8dc7d73c7d8e7b6674f4f51a Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Thu, 30 Dec 2021 21:47:35 -0600 Subject: Remove AO1 MS code You won't be missed :') --- include/aoapplication.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/aoapplication.h') diff --git a/include/aoapplication.h b/include/aoapplication.h index 1102ffd0..c094a333 100644 --- a/include/aoapplication.h +++ b/include/aoapplication.h @@ -75,7 +75,6 @@ public: void construct_courtroom(); void destruct_courtroom(); - void ms_packet_received(AOPacket *p_packet); void server_packet_received(AOPacket *p_packet); void send_server_packet(AOPacket *p_packet, bool encoded = true); -- cgit