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

More player leaving fixes (#6148)

Browse source 
* Remove unnecessary parentheses.

Took 16 minutes

* Reorder player-left signals

Took 11 seconds

* Connect PlayerManager::playerRemoved signal to TabGame::processPlayerLeave.

Took 21 seconds

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2025-09-15 20:03:00 +02:00 • committed by GitHub
parent f4fbe90a72
commit 190ab211e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/src/client/tabs/tab_game.cpp
View file

@ -149,6 +149,7 @@ void TabGame::connectToGameState()
void TabGame::connectToPlayerManager() void TabGame::connectToPlayerManager()
{ {
connect(game->getPlayerManager(), &PlayerManager::playerAdded, this, &TabGame::addPlayer); connect(game->getPlayerManager(), &PlayerManager::playerAdded, this, &TabGame::addPlayer);
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);
} }

2
cockatrice/src/game/game_scene.cpp
View file

@ -85,7 +85,7 @@ void GameScene::rearrange()
Player *p = playersIter.next()->getPlayer(); Player *p = playersIter.next()->getPlayer();
if (p && !p->getConceded()) { if (p && !p->getConceded()) {
playersPlaying.append(p); playersPlaying.append(p);
if (!firstPlayerFound && (p->getPlayerInfo()->getLocal())) { if (!firstPlayerFound && p->getPlayerInfo()->getLocal()) {
firstPlayerIndex = playersPlaying.size() - 1; firstPlayerIndex = playersPlaying.size() - 1;
firstPlayerFound = true; firstPlayerFound = true;
} }

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

@ -57,9 +57,9 @@ void PlayerManager::removePlayer(int playerId)
if (!player) { if (!player) {
return; return;
} }
players.remove(playerId);
emit playerCountChanged();
emit playerRemoved(player); emit playerRemoved(player);
emit playerCountChanged();
players.remove(playerId);
} }
Player *PlayerManager::getPlayer(int playerId) const Player *PlayerManager::getPlayer(int playerId) const