gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2025-12-27 13:14:13 -08:00
Code Issues Packages Projects Releases Wiki Activity

Support starting games with fewer than max players (#5338)

Browse Source
This commit is contained in:
Zach H
2024-12-26 18:32:20 -05:00
committed by GitHub
parent 956c12eb32
commit 6dfd354973
6 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/server_player.cpp
View File

@@ -944,7 +944,7 @@ Server_Player::cmdReadyStart(const Command_ReadyStart &cmd, ResponseContainer &
return Response::RespContextError;
}
if (readyStart == cmd.ready()) {
if (readyStart == cmd.ready() && !cmd.force_start()) {
return Response::RespContextError;
}
@@ -955,8 +955,13 @@ Server_Player::cmdReadyStart(const Command_ReadyStart &cmd, ResponseContainer &
ges.enqueueGameEvent(event, playerId);
ges.setGameEventContext(Context_ReadyStart());
if (cmd.ready()) {
game->startGameIfReady();
if (cmd.force_start()) {
if (game->getHostId() != playerId) {
return Response::RespFunctionNotAllowed;
}
game->startGameIfReady(true);
} else if (cmd.ready()) {
game->startGameIfReady(false);
}
return Response::RespOk;