jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-08 02:53:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Tournament] Fix GameConfig forward declaration and annotate command handlers

Browse source 
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.
This commit is contained in:
Lukas Brübach 2026-10-11 14:58:06 +02:00
parent d44217983a
commit cf78ca9d1a
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libcockatrice_network/libcockatrice/network/server/remote/game/server_match_game_factory.h
View file

@ -3,7 +3,7 @@
#include <QString> #include <QString>
class GameConfig; struct GameConfig;
class Server_Game; class Server_Game;
class Server_AbstractUserInterface; class Server_AbstractUserInterface;

6
libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto
View file

@ -182,12 +182,18 @@ message GameCommand {
SET_PLAYMAT = 1035; SET_PLAYMAT = 1035;
/// Report the result of a tournament match sub-game. /// Report the result of a tournament match sub-game.
/// Server: Server_AbstractParticipant::cmdReportMatchResult
/// Client: reflected via tournament state events
REPORT_MATCH_RESULT = 1037; REPORT_MATCH_RESULT = 1037;
/// Advance the tournament to the next round. /// Advance the tournament to the next round.
/// Server: Server_AbstractParticipant::cmdAdvanceTournament
/// Client: reflected via tournament state events
ADVANCE_TOURNAMENT = 1038; ADVANCE_TOURNAMENT = 1038;
/// Select tournament settings. /// Select tournament settings.
/// Server: Server_AbstractParticipant::cmdTournamentSettingsSelect
/// Client: reflected via tournament state events
TOURNAMENT_SETTINGS_SELECT = 1039; TOURNAMENT_SETTINGS_SELECT = 1039;
} }