jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 14:32:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Handle concession properly.

Browse source 
Took 57 minutes

Took 38 seconds

Took 18 seconds

Took 21 seconds
This commit is contained in:
Lukas Brübach 2025-09-26 11:23:21 +02:00
parent 762ea47b8e
commit 8abb0348a0
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/game/player/player_manager.cpp
View file

@ -72,14 +72,6 @@ Player *PlayerManager::getPlayer(int playerId) const
void PlayerManager::onPlayerConceded(int playerId, bool conceded) void PlayerManager::onPlayerConceded(int playerId, bool conceded)
{ {
// GameEventHandler cares about this for sending the concede/unconcede commands
if (isLocalPlayer(playerId)) {
if (conceded) {
emit activeLocalPlayerConceded();
} else {
emit activeLocalPlayerUnconceded();
}
}
// Everything else cares about this // Everything else cares about this
if (conceded) { if (conceded) {
emit playerConceded(playerId); emit playerConceded(playerId);

6
cockatrice/src/tabs/tab_game.cpp
View file

@ -152,6 +152,7 @@ void TabGame::connectToPlayerManager()
connect(game->getPlayerManager(), &PlayerManager::playerRemoved, this, &TabGame::processPlayerLeave); connect(game->getPlayerManager(), &PlayerManager::playerRemoved, this, &TabGame::processPlayerLeave);
// update menu text when player concedes so that "concede" gets updated to "unconcede" // update menu text when player concedes so that "concede" gets updated to "unconcede"
connect(game->getPlayerManager(), &PlayerManager::playerConceded, this, &TabGame::retranslateUi); connect(game->getPlayerManager(), &PlayerManager::playerConceded, this, &TabGame::retranslateUi);
connect(game->getPlayerManager(), &PlayerManager::playerUnconceded, this, &TabGame::retranslateUi);
} }
void TabGame::connectToGameEventHandler() void TabGame::connectToGameEventHandler()
@ -497,13 +498,14 @@ void TabGame::actConcede()
if (QMessageBox::question(this, tr("Concede"), tr("Are you sure you want to concede this game?"), if (QMessageBox::question(this, tr("Concede"), tr("Are you sure you want to concede this game?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
return; return;
emit game->getPlayerManager()->activeLocalPlayerConceded();
player->setConceded(true); player->setConceded(true);
} else { } else {
if (QMessageBox::question(this, tr("Unconcede"), if (QMessageBox::question(this, tr("Unconcede"),
tr("You have already conceded. Do you want to return to this game?"), tr("You have already conceded. Do you want to return to this game?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
return; return;
emit game->getPlayerManager()->activeLocalPlayerUnconceded();
player->setConceded(false); player->setConceded(false);
} }
} }
@ -821,6 +823,8 @@ void TabGame::stopGame()
playerListWidget->setGameStarted(false, false); playerListWidget->setGameStarted(false, false);
scene->clearViews(); scene->clearViews();
retranslateUi();
} }
void TabGame::closeGame() void TabGame::closeGame()