From e4ad97847d155078073ded069cb653a9864c6b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 11 Oct 2026 14:58:06 +0200 Subject: [PATCH] [Tournament] Fix GameConfig forward declaration and annotate command handlers Forward-declare GameConfig as struct to match its definition in game_config.h; the class/struct mismatch trips -Werror -Wmismatched-tags on macOS. Also add the missing /// Server: annotations on the tournament GameCommandType entries now that the Server_AbstractParticipant handlers they point at exist in the tree. --- .../network/server/remote/game/server_match_game_factory.h | 2 +- .../libcockatrice/protocol/pb/game_commands.proto | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_match_game_factory.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_match_game_factory.h index d5cf81cb6..3963b99d2 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_match_game_factory.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_match_game_factory.h @@ -3,7 +3,7 @@ #include -class GameConfig; +struct GameConfig; class Server_Game; class Server_AbstractUserInterface; diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto index 68a79eb6b..21560278c 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto @@ -182,12 +182,18 @@ message GameCommand { SET_PLAYMAT = 1035; /// Report the result of a tournament match sub-game. + /// Server: Server_AbstractParticipant::cmdReportMatchResult + /// Client: reflected via tournament state events REPORT_MATCH_RESULT = 1037; /// Advance the tournament to the next round. + /// Server: Server_AbstractParticipant::cmdAdvanceTournament + /// Client: reflected via tournament state events ADVANCE_TOURNAMENT = 1038; /// Select tournament settings. + /// Server: Server_AbstractParticipant::cmdTournamentSettingsSelect + /// Client: reflected via tournament state events TOURNAMENT_SETTINGS_SELECT = 1039; }