Player refactor (#6112)

* Player refactor. Took 1 hour 43 minutes Took 1 minute Took 23 seconds * Tiny lint. Took 3 minutes * Hook up tap logic again. Took 13 minutes * Fix an include. Took 3 minutes * Stuff. Took 6 minutes * Fix typo. Took 7 minutes * Include. Took 1 minute * Reorganize method/variable definitions, remove unused ones. Took 1 hour 8 minutes Took 24 seconds * Clean up some unused imports. Took 6 minutes * Player holds the deck, emits deckChanged(), other elements player->getDeck() to respond to changes. Took 37 minutes * Connect player->openDeckEditor signal directly in the player constructor Took 6 minutes * Emit openDeckEditor signal in player_actions again. Took 3 minutes * Do to-do's Took 3 hours 32 minutes * Lint. Took 3 minutes * Lint again. Took 2 minutes * Fix include. Took 32 minutes * The stack should ensure card visibility. Took 21 minutes * Fine, the game can remember the tab. Took 10 minutes Took 21 seconds Took 9 seconds * zoneId is a dynamic gameplay property and thus belongs in player.cpp Took 11 minutes Took 19 seconds * Signal view removal, addition. Took 5 minutes * Ensure all players are considered local in local game. Took 10 minutes * ENSURE they are. Took 8 minutes * Bounds check data sent by QAction() Took 54 minutes * Move comment. Took 20 seconds * Reimplement logging category for game_event_handler.cpp, remove linebreaks. Took 36 seconds * PlayerGraphicsItem is responsible for retranslateUi, not Player. Took 14 seconds * Set menu for sideboard again, translate some menu titles, reimplement actIncPT action Took 54 seconds * Comment spacing. Took 43 seconds * Change message_log_widget.cpp slots to take CardZoneLogic parameters as emitted by PlayerEventHandler. Took 7 minutes Took 14 seconds * Remove unused player_logger.cpp Took 2 minutes * Query local game state correctly from tab_supervisor again Took 3 minutes * Revert Deck legality checker. Took 3 minutes * Instantiate menu before graphics item. Took 1 hour 5 minutes Took 55 minutes * Differentiate games and replays. Took 9 seconds * Lint. Took 10 minutes --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
2026-04-27 07:48:01 -07:00 · 2025-09-11 00:49:33 +02:00 · 2025-09-11 00:49:33 +02:00 · 9601a1fa4e
commit 9601a1fa4e
parent b8e545bfa4
92 changed files with 7104 additions and 5827 deletions
--- a/cockatrice/src/game/player/player_manager.cpp
+++ b/cockatrice/src/game/player/player_manager.cpp
@ -0,0 +1,84 @@
+#include "player_manager.h"
+
+#include "../abstract_game.h"
+#include "player.h"
+
+PlayerManager::PlayerManager(AbstractGame *_game,
+                             int _localPlayerId,
+                             bool _localPlayerIsJudge,
+                             bool localPlayerIsSpectator)
+    : QObject(_game), game(_game), players(QMap<int, Player *>()), localPlayerId(_localPlayerId),
+      localPlayerIsJudge(_localPlayerIsJudge), localPlayerIsSpectator(localPlayerIsSpectator)
+{
+}
+
+bool PlayerManager::isMainPlayerConceded() const
+{
+    Player *player = players.value(localPlayerId, nullptr);
+    return player && player->getConceded();
+}
+
+Player *PlayerManager::getActiveLocalPlayer(int activePlayer) const
+{
+    Player *active = players.value(activePlayer, 0);
+    if (active)
+        if (active->getPlayerInfo()->getLocal())
+            return active;
+
+    QMapIterator<int, Player *> playerIterator(players);
+    while (playerIterator.hasNext()) {
+        Player *temp = playerIterator.next().value();
+        if (temp->getPlayerInfo()->getLocal())
+            return temp;
+    }
+
+    return nullptr;
+}
+
+Player *PlayerManager::addPlayer(int playerId, const ServerInfo_User &info)
+{
+    auto *newPlayer = new Player(info, playerId, isLocalPlayer(playerId) || game->getGameState()->getIsLocalGame(),
+                                 isJudge(), getGame());
+    connect(newPlayer, &Player::concededChanged, this, &PlayerManager::playerConceded);
+    players.insert(playerId, newPlayer);
+    emit playerAdded(newPlayer);
+    emit playerCountChanged();
+    return newPlayer;
+}
+
+void PlayerManager::removePlayer(int playerId)
+{
+    Player *player = getPlayer(playerId);
+    if (!player) {
+        return;
+    }
+    players.remove(playerId);
+    emit playerCountChanged();
+    emit playerRemoved(player);
+}
+
+Player *PlayerManager::getPlayer(int playerId) const
+{
+    Player *player = players.value(playerId, 0);
+    if (!player)
+        return nullptr;
+    return player;
+}
+
+void PlayerManager::onPlayerConceded(int playerId, bool conceded)
+{
+    // GameEventHandler cares about this for sending the concede/unconcede commands
+    if (playerId == getActiveLocalPlayer(playerId)->getPlayerInfo()->getId()) {
+        if (conceded) {
+            emit activeLocalPlayerConceded();
+        } else {
+            emit activeLocalPlayerUnconceded();
+        }
+    }
+    // Everything else cares about this
+    if (conceded) {
+        emit playerConceded(playerId);
+    } else {
+        emit playerUnconceded(playerId);
+    }
+}