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-07-03 12:03:55 -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.h
+++ b/cockatrice/src/game/player/player_manager.h
@ -0,0 +1,114 @@
+#ifndef COCKATRICE_PLAYER_MANAGER_H
+#define COCKATRICE_PLAYER_MANAGER_H
+
+#include "pb/serverinfo_playerproperties.pb.h"
+
+#include <QMap>
+#include <QObject>
+
+class AbstractGame;
+class Player;
+class PlayerManager : public QObject
+{
+    Q_OBJECT
+
+public:
+    PlayerManager(AbstractGame *_game, int _localPlayerId, bool _localPlayerIsJudge, bool localPlayerIsSpectator);
+
+    AbstractGame *game;
+    QMap<int, Player *> players;
+    int localPlayerId;
+    bool localPlayerIsJudge;
+    bool localPlayerIsSpectator;
+    QMap<int, ServerInfo_User> spectators;
+
+    bool isSpectator() const
+    {
+        return localPlayerIsSpectator;
+    }
+
+    bool isJudge() const
+    {
+        return localPlayerIsJudge;
+    }
+
+    int getLocalPlayerId() const
+    {
+        return localPlayerId;
+    }
+
+    const QMap<int, Player *> &getPlayers() const
+    {
+        return players;
+    }
+
+    int getPlayerCount() const
+    {
+        return players.size();
+    }
+
+    Player *getActiveLocalPlayer(int activePlayer) const;
+
+    Player *addPlayer(int playerId, const ServerInfo_User &info);
+
+    void removePlayer(int playerId);
+
+    Player *getPlayer(int playerId) const;
+
+    void onPlayerConceded(int playerId, bool conceded);
+
+    [[nodiscard]] bool isMainPlayerConceded() const;
+
+    [[nodiscard]] bool isLocalPlayer(int playerId) const
+    {
+        return playerId == getLocalPlayerId();
+    }
+
+    const QMap<int, ServerInfo_User> &getSpectators() const
+    {
+        return spectators;
+    }
+
+    ServerInfo_User getSpectator(int playerId) const
+    {
+        return spectators.value(playerId);
+    }
+
+    QString getSpectatorName(int spectatorId) const
+    {
+        return QString::fromStdString(spectators.value(spectatorId).name());
+    }
+
+    void addSpectator(int spectatorId, const ServerInfo_PlayerProperties &prop)
+    {
+        if (!spectators.contains(spectatorId)) {
+            spectators.insert(spectatorId, prop.user_info());
+            emit spectatorAdded(prop);
+        }
+    }
+
+    void removeSpectator(int spectatorId)
+    {
+        ServerInfo_User spectatorInfo = spectators.value(spectatorId);
+        spectators.remove(spectatorId);
+        emit spectatorRemoved(spectatorId, spectatorInfo);
+    }
+
+    AbstractGame *getGame() const
+    {
+        return game;
+    }
+
+signals:
+    void playerAdded(Player *player);
+    void playerRemoved(Player *player);
+    void activeLocalPlayerConceded();
+    void activeLocalPlayerUnconceded();
+    void playerConceded(int playerId);
+    void playerUnconceded(int playerId);
+    void playerCountChanged();
+    void spectatorAdded(ServerInfo_PlayerProperties spectator);
+    void spectatorRemoved(int spectatorId, ServerInfo_User spectator);
+};
+
+#endif // COCKATRICE_PLAYER_MANAGER_H