jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-27 08:24:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[Server] Adapt tournament engine to the shared settings message

Browse source 
- read games per match from Command_CreateGame.tournament_settings after the
  proto rework replaced the standalone games_per_match field
- use qWarning to match the surrounding file
This commit is contained in:
Lukas Brübach 2026-09-02 09:47:27 +02:00 • committed by GitHub
parent 18fac5c5b9
commit 99a409de09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
View file

@ -977,7 +977,7 @@ void Server_Game::startTournament()
// A tournament with fewer than two players can't produce a valid bracket. // A tournament with fewer than two players can't produce a valid bracket.
if (tournament->getPlayerCount() < 2) { if (tournament->getPlayerCount() < 2) {
qCWarning() << "Cannot start tournament with fewer than 2 players"; qWarning() << "Cannot start tournament with fewer than 2 players";
return; return;
} }

3
libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
View file

@ -918,7 +918,8 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room
bool shareDecklistsOnLoad = cmd.has_share_decklists_on_load() ? cmd.share_decklists_on_load() : false; bool shareDecklistsOnLoad = cmd.has_share_decklists_on_load() ? cmd.share_decklists_on_load() : false;
bool isTournament = cmd.has_is_tournament() ? cmd.is_tournament() : false; bool isTournament = cmd.has_is_tournament() ? cmd.is_tournament() : false;
int gamesPerMatch = cmd.has_games_per_match() ? static_cast<int>(cmd.games_per_match()) : 1; int gamesPerMatch =
cmd.has_tournament_settings() ? static_cast<int>(cmd.tournament_settings().games_per_match()) : 1;
const int gameId = databaseInterface->getNextGameId(); const int gameId = databaseInterface->getNextGameId();
if (gameId == -1) { if (gameId == -1) {