From e2cbbecefe69dc23e5c69f15f97f30f36a213b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Wed, 7 Oct 2026 09:27:34 +0200 Subject: [PATCH] [Refactor] Retype card containers and zone logic onto CardState --- cockatrice/src/game/abstract_game.h | 2 +- cockatrice/src/game/zones/pile_zone_logic.cpp | 4 ---- cockatrice/src/game/zones/table_zone_logic.cpp | 5 ----- cockatrice/src/game/zones/view_zone_logic.cpp | 1 - 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/cockatrice/src/game/abstract_game.h b/cockatrice/src/game/abstract_game.h index 505bfc1b5..4bf8c120e 100644 --- a/cockatrice/src/game/abstract_game.h +++ b/cockatrice/src/game/abstract_game.h @@ -19,7 +19,7 @@ class GameMetaInfo; class GameReplay; class GameState; class PlayerManager; - +class CardState; class AbstractGame : public QObject { Q_OBJECT diff --git a/cockatrice/src/game/zones/pile_zone_logic.cpp b/cockatrice/src/game/zones/pile_zone_logic.cpp index 42ef4f0b2..e33d8fe79 100644 --- a/cockatrice/src/game/zones/pile_zone_logic.cpp +++ b/cockatrice/src/game/zones/pile_zone_logic.cpp @@ -1,11 +1,7 @@ #include "pile_zone_logic.h" -#include "../board/card_list.h" #include "../board/card_state.h" -class PlayerLogic; -class QObject; - PileZoneLogic::PileZoneLogic(PlayerLogic *_player, const QString &_name, bool _hasCardAttr, diff --git a/cockatrice/src/game/zones/table_zone_logic.cpp b/cockatrice/src/game/zones/table_zone_logic.cpp index 7a6e74adf..834794268 100644 --- a/cockatrice/src/game/zones/table_zone_logic.cpp +++ b/cockatrice/src/game/zones/table_zone_logic.cpp @@ -1,14 +1,9 @@ #include "table_zone_logic.h" -#include "../board/card_list.h" #include "../board/card_state.h" -#include "libcockatrice/card/card_info.h" #include -class PlayerLogic; -class QObject; - TableZoneLogic::TableZoneLogic(PlayerLogic *_player, const QString &_name, bool _hasCardAttr, diff --git a/cockatrice/src/game/zones/view_zone_logic.cpp b/cockatrice/src/game/zones/view_zone_logic.cpp index 5a69b2ab7..a9c763954 100644 --- a/cockatrice/src/game/zones/view_zone_logic.cpp +++ b/cockatrice/src/game/zones/view_zone_logic.cpp @@ -1,7 +1,6 @@ #include "view_zone_logic.h" #include "../../client/settings/cache_settings.h" -#include "../board/card_list.h" #include "../board/card_state.h" #include