gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2025-12-29 06:05:30 -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

29
common/server_game.cpp
View File

@@ -81,7 +81,7 @@ Server_Game::Server_Game(const ServerInfo_User &_creatorInfo,
currentReplay->set_replay_id(room->getServer()->getDatabaseInterface()->getNextReplayId());
description = _description.simplified();
connect(this, SIGNAL(sigStartGameIfReady()), this, SLOT(doStartGameIfReady()), Qt::QueuedConnection);
connect(this, &Server_Game::sigStartGameIfReady, this, &Server_Game::doStartGameIfReady, Qt::QueuedConnection);
getInfo(*currentReplay->mutable_game_info());
@@ -311,20 +311,31 @@ void Server_Game::sendGameStateToPlayers()
}
}
void Server_Game::doStartGameIfReady()
void Server_Game::doStartGameIfReady(bool forceStartGame)
{
Server_DatabaseInterface *databaseInterface = room->getServer()->getDatabaseInterface();
QMutexLocker locker(&gameMutex);
if (getPlayerCount() < maxPlayers)
if (getPlayerCount() < maxPlayers && !forceStartGame) {
return;
for (Server_Player *player : players.values()) {
if (!player->getReadyStart() && !player->getSpectator())
return;
}
for (Server_Player *player : players.values()) {
if (!player->getSpectator())
if (!player->getReadyStart() && !player->getSpectator()) {
if (forceStartGame) {
// Player is not ready to start, so kick them
// TODO: Move them to Spectators instead
kickPlayer(player->getPlayerId());
} else {
return;
}
}
}
for (Server_Player *player : players.values()) {
if (!player->getSpectator()) {
player->setupZones();
}
}
gameStarted = true;
@@ -369,9 +380,9 @@ void Server_Game::doStartGameIfReady()
emit gameInfoChanged(gameInfo);
}
void Server_Game::startGameIfReady()
void Server_Game::startGameIfReady(bool forceStartGame)
{
emit sigStartGameIfReady();
emit sigStartGameIfReady(forceStartGame);
}
void Server_Game::stopGameIfFinished()