From cba9ce2b2b0704fc9e2c508ea523eb2b42570660 Mon Sep 17 00:00:00 2001 From: BruebachL <44814898+BruebachL@users.noreply.github.com> Date: Mon, 18 May 2026 06:36:18 +0200 Subject: [PATCH] [Game/Zones] Simple move refactor to differentiate between logic and graphics for zones (#6903) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Game/Zones] Simple move refactor to differentiate between logic and graphics for zones Took 21 minutes * Clean up game/zones/logic folder. Took 6 minutes * Adjust tests. Took 3 minutes --------- Co-authored-by: Lukas Brübach --- cockatrice/CMakeLists.txt | 28 +++++++++---------- cockatrice/src/game/board/arrow_item.cpp | 2 +- cockatrice/src/game/board/card_drag_item.cpp | 6 ++-- cockatrice/src/game/board/card_item.cpp | 6 ++-- cockatrice/src/game/board/card_item.h | 2 +- cockatrice/src/game/game_scene.cpp | 6 ++-- cockatrice/src/game/game_scene.h | 2 +- cockatrice/src/game/hand_counter.cpp | 2 +- cockatrice/src/game/log/message_log_widget.h | 2 +- cockatrice/src/game/player/menu/card_menu.cpp | 2 +- cockatrice/src/game/player/menu/hand_menu.cpp | 2 +- .../src/game/player/menu/player_menu.cpp | 6 ++-- cockatrice/src/game/player/player.cpp | 8 +++--- cockatrice/src/game/player/player.h | 8 +++--- cockatrice/src/game/player/player_actions.cpp | 6 ++-- .../src/game/player/player_event_handler.cpp | 2 +- .../src/game/player/player_graphics_item.cpp | 8 +++--- .../zones/{logic => }/card_zone_algorithms.h | 0 .../zones/{logic => }/card_zone_logic.cpp | 8 +++--- .../game/zones/{logic => }/card_zone_logic.h | 4 +-- .../zones/{logic => }/hand_zone_logic.cpp | 2 +- .../game/zones/{logic => }/hand_zone_logic.h | 0 .../zones/{logic => }/pile_zone_logic.cpp | 2 +- .../game/zones/{logic => }/pile_zone_logic.h | 0 .../zones/{logic => }/stack_zone_logic.cpp | 2 +- .../game/zones/{logic => }/stack_zone_logic.h | 0 .../zones/{logic => }/table_zone_logic.cpp | 2 +- .../game/zones/{logic => }/table_zone_logic.h | 0 .../zones/{logic => }/view_zone_logic.cpp | 4 +-- .../game/zones/{logic => }/view_zone_logic.h | 0 .../zones/card_zone.cpp | 2 +- .../{game => game_graphics}/zones/card_zone.h | 6 ++-- .../zones/hand_zone.cpp | 8 +++--- .../{game => game_graphics}/zones/hand_zone.h | 2 +- .../zones/pile_zone.cpp | 10 +++---- .../{game => game_graphics}/zones/pile_zone.h | 2 +- .../zones/select_zone.cpp | 4 +-- .../zones/select_zone.h | 0 .../zones/stack_zone.cpp | 12 ++++---- .../zones/stack_zone.h | 2 +- .../zones/table_zone.cpp | 14 +++++----- .../zones/table_zone.h | 4 +-- .../zones/view_zone.cpp | 10 +++---- .../{game => game_graphics}/zones/view_zone.h | 2 +- .../zones/view_zone_widget.cpp | 10 +++---- .../zones/view_zone_widget.h | 2 +- tests/card_zone_algorithms/CMakeLists.txt | 2 +- 47 files changed, 107 insertions(+), 107 deletions(-) rename cockatrice/src/game/zones/{logic => }/card_zone_algorithms.h (100%) rename cockatrice/src/game/zones/{logic => }/card_zone_logic.cpp (98%) rename cockatrice/src/game/zones/{logic => }/card_zone_logic.h (97%) rename cockatrice/src/game/zones/{logic => }/hand_zone_logic.cpp (94%) rename cockatrice/src/game/zones/{logic => }/hand_zone_logic.h (100%) rename cockatrice/src/game/zones/{logic => }/pile_zone_logic.cpp (96%) rename cockatrice/src/game/zones/{logic => }/pile_zone_logic.h (100%) rename cockatrice/src/game/zones/{logic => }/stack_zone_logic.cpp (94%) rename cockatrice/src/game/zones/{logic => }/stack_zone_logic.h (100%) rename cockatrice/src/game/zones/{logic => }/table_zone_logic.cpp (96%) rename cockatrice/src/game/zones/{logic => }/table_zone_logic.h (100%) rename cockatrice/src/game/zones/{logic => }/view_zone_logic.cpp (98%) rename cockatrice/src/game/zones/{logic => }/view_zone_logic.h (100%) rename cockatrice/src/{game => game_graphics}/zones/card_zone.cpp (97%) rename cockatrice/src/{game => game_graphics}/zones/card_zone.h (92%) rename cockatrice/src/{game => game_graphics}/zones/hand_zone.cpp (96%) rename cockatrice/src/{game => game_graphics}/zones/hand_zone.h (95%) rename cockatrice/src/{game => game_graphics}/zones/pile_zone.cpp (95%) rename cockatrice/src/{game => game_graphics}/zones/pile_zone.h (96%) rename cockatrice/src/{game => game_graphics}/zones/select_zone.cpp (99%) rename cockatrice/src/{game => game_graphics}/zones/select_zone.h (100%) rename cockatrice/src/{game => game_graphics}/zones/stack_zone.cpp (91%) rename cockatrice/src/{game => game_graphics}/zones/stack_zone.h (94%) rename cockatrice/src/{game => game_graphics}/zones/table_zone.cpp (97%) rename cockatrice/src/{game => game_graphics}/zones/table_zone.h (98%) rename cockatrice/src/{game => game_graphics}/zones/view_zone.cpp (98%) rename cockatrice/src/{game => game_graphics}/zones/view_zone.h (98%) rename cockatrice/src/{game => game_graphics}/zones/view_zone_widget.cpp (99%) rename cockatrice/src/{game => game_graphics}/zones/view_zone_widget.h (98%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index a4e357f60..ab47aff80 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -104,20 +104,20 @@ set(cockatrice_SOURCES src/game/player/player_manager.cpp src/game/player/player_target.cpp src/game/replay.cpp - src/game/zones/card_zone.cpp - src/game/zones/hand_zone.cpp - src/game/zones/logic/card_zone_logic.cpp - src/game/zones/logic/hand_zone_logic.cpp - src/game/zones/logic/pile_zone_logic.cpp - src/game/zones/logic/stack_zone_logic.cpp - src/game/zones/logic/table_zone_logic.cpp - src/game/zones/logic/view_zone_logic.cpp - src/game/zones/pile_zone.cpp - src/game/zones/select_zone.cpp - src/game/zones/stack_zone.cpp - src/game/zones/table_zone.cpp - src/game/zones/view_zone.cpp - src/game/zones/view_zone_widget.cpp + src/game/zones/card_zone_logic.cpp + src/game/zones/hand_zone_logic.cpp + src/game/zones/pile_zone_logic.cpp + src/game/zones/stack_zone_logic.cpp + src/game/zones/table_zone_logic.cpp + src/game/zones/view_zone_logic.cpp + src/game_graphics/zones/card_zone.cpp + src/game_graphics/zones/hand_zone.cpp + src/game_graphics/zones/pile_zone.cpp + src/game_graphics/zones/select_zone.cpp + src/game_graphics/zones/stack_zone.cpp + src/game_graphics/zones/table_zone.cpp + src/game_graphics/zones/view_zone.cpp + src/game_graphics/zones/view_zone_widget.cpp src/game_graphics/board/abstract_graphics_item.cpp src/interface/card_picture_loader/card_picture_loader.cpp src/interface/card_picture_loader/card_picture_loader_local.cpp diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp index 53d8ea33e..498a3dfab 100644 --- a/cockatrice/src/game/board/arrow_item.cpp +++ b/cockatrice/src/game/board/arrow_item.cpp @@ -2,11 +2,11 @@ #include "arrow_item.h" #include "../../client/settings/cache_settings.h" +#include "../../game_graphics/zones/card_zone.h" #include "../player/player.h" #include "../player/player_actions.h" #include "../player/player_target.h" #include "../z_values.h" -#include "../zones/card_zone.h" #include "card_item.h" #include diff --git a/cockatrice/src/game/board/card_drag_item.cpp b/cockatrice/src/game/board/card_drag_item.cpp index 49467c5c9..39fb9a390 100644 --- a/cockatrice/src/game/board/card_drag_item.cpp +++ b/cockatrice/src/game/board/card_drag_item.cpp @@ -1,9 +1,9 @@ #include "card_drag_item.h" +#include "../../game_graphics/zones/card_zone.h" +#include "../../game_graphics/zones/table_zone.h" +#include "../../game_graphics/zones/view_zone.h" #include "../game_scene.h" -#include "../zones/card_zone.h" -#include "../zones/table_zone.h" -#include "../zones/view_zone.h" #include "card_item.h" #include diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp index 695e94a3a..d85937894 100644 --- a/cockatrice/src/game/board/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -1,14 +1,14 @@ #include "card_item.h" #include "../../client/settings/cache_settings.h" +#include "../../game_graphics/zones/table_zone.h" +#include "../../game_graphics/zones/view_zone.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../game_scene.h" #include "../phase.h" #include "../player/player.h" #include "../player/player_actions.h" -#include "../zones/logic/view_zone_logic.h" -#include "../zones/table_zone.h" -#include "../zones/view_zone.h" +#include "../zones/view_zone_logic.h" #include "arrow_item.h" #include "card_drag_item.h" diff --git a/cockatrice/src/game/board/card_item.h b/cockatrice/src/game/board/card_item.h index 9799b5067..c0dd03d3d 100644 --- a/cockatrice/src/game/board/card_item.h +++ b/cockatrice/src/game/board/card_item.h @@ -7,7 +7,7 @@ #ifndef CARDITEM_H #define CARDITEM_H -#include "../zones/logic/card_zone_logic.h" +#include "../zones/card_zone_logic.h" #include "abstract_card_item.h" #include diff --git a/cockatrice/src/game/game_scene.cpp b/cockatrice/src/game/game_scene.cpp index 9141a9d54..b5026ad33 100644 --- a/cockatrice/src/game/game_scene.cpp +++ b/cockatrice/src/game/game_scene.cpp @@ -1,13 +1,13 @@ #include "game_scene.h" #include "../client/settings/cache_settings.h" +#include "../game_graphics/zones/select_zone.h" +#include "../game_graphics/zones/view_zone.h" +#include "../game_graphics/zones/view_zone_widget.h" #include "board/card_item.h" #include "phases_toolbar.h" #include "player/player.h" #include "player/player_graphics_item.h" -#include "zones/select_zone.h" -#include "zones/view_zone.h" -#include "zones/view_zone_widget.h" #include #include diff --git a/cockatrice/src/game/game_scene.h b/cockatrice/src/game/game_scene.h index 6d491297c..0cb332ad0 100644 --- a/cockatrice/src/game/game_scene.h +++ b/cockatrice/src/game/game_scene.h @@ -1,7 +1,7 @@ #ifndef GAMESCENE_H #define GAMESCENE_H -#include "zones/logic/card_zone_logic.h" +#include "zones/card_zone_logic.h" #include #include diff --git a/cockatrice/src/game/hand_counter.cpp b/cockatrice/src/game/hand_counter.cpp index 35989ff38..a853ae2de 100644 --- a/cockatrice/src/game/hand_counter.cpp +++ b/cockatrice/src/game/hand_counter.cpp @@ -1,6 +1,6 @@ #include "hand_counter.h" -#include "zones/card_zone.h" +#include "../game_graphics/zones/card_zone.h" #include #include diff --git a/cockatrice/src/game/log/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h index 369debd33..78f830e53 100644 --- a/cockatrice/src/game/log/message_log_widget.h +++ b/cockatrice/src/game/log/message_log_widget.h @@ -8,7 +8,7 @@ #define MESSAGELOGWIDGET_H #include "../../interface/widgets/server/chat_view/chat_view.h" -#include "../zones/logic/card_zone_logic.h" +#include "../zones/card_zone_logic.h" class AbstractGame; class CardItem; diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game/player/menu/card_menu.cpp index 54403e237..9ece326cc 100644 --- a/cockatrice/src/game/player/menu/card_menu.cpp +++ b/cockatrice/src/game/player/menu/card_menu.cpp @@ -3,7 +3,7 @@ #include "../../../client/settings/card_counter_settings.h" #include "../../../interface/widgets/tabs/tab_game.h" #include "../../board/card_item.h" -#include "../../zones/logic/view_zone_logic.h" +#include "../../zones/view_zone_logic.h" #include "../card_menu_action_type.h" #include "../player.h" #include "../player_actions.h" diff --git a/cockatrice/src/game/player/menu/hand_menu.cpp b/cockatrice/src/game/player/menu/hand_menu.cpp index 1b1ec27d6..156bf2aa9 100644 --- a/cockatrice/src/game/player/menu/hand_menu.cpp +++ b/cockatrice/src/game/player/menu/hand_menu.cpp @@ -2,8 +2,8 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" +#include "../../../game_graphics/zones/hand_zone.h" #include "../../abstract_game.h" -#include "../../zones/hand_zone.h" #include "../player.h" #include "../player_actions.h" diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp index 0dc381e28..8a0e4af8b 100644 --- a/cockatrice/src/game/player/menu/player_menu.cpp +++ b/cockatrice/src/game/player/menu/player_menu.cpp @@ -1,10 +1,10 @@ #include "player_menu.h" +#include "../../../game_graphics/zones/hand_zone.h" +#include "../../../game_graphics/zones/pile_zone.h" +#include "../../../game_graphics/zones/table_zone.h" #include "../../../interface/widgets/tabs/tab_game.h" #include "../../board/card_item.h" -#include "../../zones/hand_zone.h" -#include "../../zones/pile_zone.h" -#include "../../zones/table_zone.h" #include "card_menu.h" #include "hand_menu.h" diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index b130bcf75..b1814a587 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -1,5 +1,9 @@ #include "player.h" +#include "../../game_graphics/zones/hand_zone.h" +#include "../../game_graphics/zones/pile_zone.h" +#include "../../game_graphics/zones/stack_zone.h" +#include "../../game_graphics/zones/table_zone.h" #include "../../interface/theme_manager.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../board/arrow_item.h" @@ -7,10 +11,6 @@ #include "../board/card_list.h" #include "../board/counter_general.h" #include "../game_scene.h" -#include "../zones/hand_zone.h" -#include "../zones/pile_zone.h" -#include "../zones/stack_zone.h" -#include "../zones/table_zone.h" #include "player_actions.h" #include "player_target.h" diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h index 1e7bc928d..f9ab10207 100644 --- a/cockatrice/src/game/player/player.h +++ b/cockatrice/src/game/player/player.h @@ -10,10 +10,10 @@ #include "../../game_graphics/board/abstract_graphics_item.h" #include "../../interface/widgets/menus/tearoff_menu.h" #include "../interface/deck_loader/loaded_deck.h" -#include "../zones/logic/hand_zone_logic.h" -#include "../zones/logic/pile_zone_logic.h" -#include "../zones/logic/stack_zone_logic.h" -#include "../zones/logic/table_zone_logic.h" +#include "../zones/hand_zone_logic.h" +#include "../zones/pile_zone_logic.h" +#include "../zones/stack_zone_logic.h" +#include "../zones/table_zone_logic.h" #include "menu/player_menu.h" #include "player_area.h" #include "player_event_handler.h" diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp index 2be9c90ba..c36cdaa1a 100644 --- a/cockatrice/src/game/player/player_actions.cpp +++ b/cockatrice/src/game/player/player_actions.cpp @@ -1,14 +1,14 @@ #include "player_actions.h" +#include "../../game_graphics/zones/hand_zone.h" +#include "../../game_graphics/zones/table_zone.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../../interface/widgets/utility/get_text_with_max.h" #include "../board/card_item.h" #include "../client/settings/card_counter_settings.h" #include "../dialogs/dlg_move_top_cards_until.h" #include "../dialogs/dlg_roll_dice.h" -#include "../zones/hand_zone.h" -#include "../zones/logic/view_zone_logic.h" -#include "../zones/table_zone.h" +#include "../zones/view_zone_logic.h" #include "card_menu_action_type.h" #include diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp index dc1e2393c..afc32208d 100644 --- a/cockatrice/src/game/player/player_event_handler.cpp +++ b/cockatrice/src/game/player/player_event_handler.cpp @@ -1,10 +1,10 @@ #include "player_event_handler.h" +#include "../../game_graphics/zones/view_zone.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../board/arrow_item.h" #include "../board/card_item.h" #include "../board/card_list.h" -#include "../zones/view_zone.h" #include "player.h" #include "player_actions.h" diff --git a/cockatrice/src/game/player/player_graphics_item.cpp b/cockatrice/src/game/player/player_graphics_item.cpp index bcc4b7f72..a4f515274 100644 --- a/cockatrice/src/game/player/player_graphics_item.cpp +++ b/cockatrice/src/game/player/player_graphics_item.cpp @@ -1,12 +1,12 @@ #include "player_graphics_item.h" +#include "../../game_graphics/zones/hand_zone.h" +#include "../../game_graphics/zones/pile_zone.h" +#include "../../game_graphics/zones/stack_zone.h" +#include "../../game_graphics/zones/table_zone.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../board/abstract_card_item.h" #include "../hand_counter.h" -#include "../zones/hand_zone.h" -#include "../zones/pile_zone.h" -#include "../zones/stack_zone.h" -#include "../zones/table_zone.h" PlayerGraphicsItem::PlayerGraphicsItem(Player *_player) : player(_player) { diff --git a/cockatrice/src/game/zones/logic/card_zone_algorithms.h b/cockatrice/src/game/zones/card_zone_algorithms.h similarity index 100% rename from cockatrice/src/game/zones/logic/card_zone_algorithms.h rename to cockatrice/src/game/zones/card_zone_algorithms.h diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.cpp b/cockatrice/src/game/zones/card_zone_logic.cpp similarity index 98% rename from cockatrice/src/game/zones/logic/card_zone_logic.cpp rename to cockatrice/src/game/zones/card_zone_logic.cpp index 9d9b3767f..411aa19a9 100644 --- a/cockatrice/src/game/zones/logic/card_zone_logic.cpp +++ b/cockatrice/src/game/zones/card_zone_logic.cpp @@ -1,9 +1,9 @@ #include "card_zone_logic.h" -#include "../../board/card_item.h" -#include "../../player/player.h" -#include "../../player/player_actions.h" -#include "../view_zone.h" +#include "../../game_graphics/zones/view_zone.h" +#include "../board/card_item.h" +#include "../player/player.h" +#include "../player/player_actions.h" #include "view_zone_logic.h" #include diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.h b/cockatrice/src/game/zones/card_zone_logic.h similarity index 97% rename from cockatrice/src/game/zones/logic/card_zone_logic.h rename to cockatrice/src/game/zones/card_zone_logic.h index 1aa46effd..af770b104 100644 --- a/cockatrice/src/game/zones/logic/card_zone_logic.h +++ b/cockatrice/src/game/zones/card_zone_logic.h @@ -7,8 +7,8 @@ #ifndef COCKATRICE_CARD_ZONE_LOGIC_H #define COCKATRICE_CARD_ZONE_LOGIC_H -#include "../../../client/translation.h" -#include "../../board/card_list.h" +#include "../../client/translation.h" +#include "../board/card_list.h" #include #include diff --git a/cockatrice/src/game/zones/logic/hand_zone_logic.cpp b/cockatrice/src/game/zones/hand_zone_logic.cpp similarity index 94% rename from cockatrice/src/game/zones/logic/hand_zone_logic.cpp rename to cockatrice/src/game/zones/hand_zone_logic.cpp index efa85d649..2dca1c6f7 100644 --- a/cockatrice/src/game/zones/logic/hand_zone_logic.cpp +++ b/cockatrice/src/game/zones/hand_zone_logic.cpp @@ -1,6 +1,6 @@ #include "hand_zone_logic.h" -#include "../../board/card_item.h" +#include "../board/card_item.h" #include "card_zone_algorithms.h" HandZoneLogic::HandZoneLogic(Player *_player, diff --git a/cockatrice/src/game/zones/logic/hand_zone_logic.h b/cockatrice/src/game/zones/hand_zone_logic.h similarity index 100% rename from cockatrice/src/game/zones/logic/hand_zone_logic.h rename to cockatrice/src/game/zones/hand_zone_logic.h diff --git a/cockatrice/src/game/zones/logic/pile_zone_logic.cpp b/cockatrice/src/game/zones/pile_zone_logic.cpp similarity index 96% rename from cockatrice/src/game/zones/logic/pile_zone_logic.cpp rename to cockatrice/src/game/zones/pile_zone_logic.cpp index d445ad90c..440b8df81 100644 --- a/cockatrice/src/game/zones/logic/pile_zone_logic.cpp +++ b/cockatrice/src/game/zones/pile_zone_logic.cpp @@ -1,6 +1,6 @@ #include "pile_zone_logic.h" -#include "../../board/card_item.h" +#include "../board/card_item.h" PileZoneLogic::PileZoneLogic(Player *_player, const QString &_name, diff --git a/cockatrice/src/game/zones/logic/pile_zone_logic.h b/cockatrice/src/game/zones/pile_zone_logic.h similarity index 100% rename from cockatrice/src/game/zones/logic/pile_zone_logic.h rename to cockatrice/src/game/zones/pile_zone_logic.h diff --git a/cockatrice/src/game/zones/logic/stack_zone_logic.cpp b/cockatrice/src/game/zones/stack_zone_logic.cpp similarity index 94% rename from cockatrice/src/game/zones/logic/stack_zone_logic.cpp rename to cockatrice/src/game/zones/stack_zone_logic.cpp index 6f3cb6e99..7208a259d 100644 --- a/cockatrice/src/game/zones/logic/stack_zone_logic.cpp +++ b/cockatrice/src/game/zones/stack_zone_logic.cpp @@ -1,6 +1,6 @@ #include "stack_zone_logic.h" -#include "../../board/card_item.h" +#include "../board/card_item.h" #include "card_zone_algorithms.h" StackZoneLogic::StackZoneLogic(Player *_player, diff --git a/cockatrice/src/game/zones/logic/stack_zone_logic.h b/cockatrice/src/game/zones/stack_zone_logic.h similarity index 100% rename from cockatrice/src/game/zones/logic/stack_zone_logic.h rename to cockatrice/src/game/zones/stack_zone_logic.h diff --git a/cockatrice/src/game/zones/logic/table_zone_logic.cpp b/cockatrice/src/game/zones/table_zone_logic.cpp similarity index 96% rename from cockatrice/src/game/zones/logic/table_zone_logic.cpp rename to cockatrice/src/game/zones/table_zone_logic.cpp index d01a756a3..e6c9b8101 100644 --- a/cockatrice/src/game/zones/logic/table_zone_logic.cpp +++ b/cockatrice/src/game/zones/table_zone_logic.cpp @@ -1,6 +1,6 @@ #include "table_zone_logic.h" -#include "../../board/card_item.h" +#include "../board/card_item.h" TableZoneLogic::TableZoneLogic(Player *_player, const QString &_name, diff --git a/cockatrice/src/game/zones/logic/table_zone_logic.h b/cockatrice/src/game/zones/table_zone_logic.h similarity index 100% rename from cockatrice/src/game/zones/logic/table_zone_logic.h rename to cockatrice/src/game/zones/table_zone_logic.h diff --git a/cockatrice/src/game/zones/logic/view_zone_logic.cpp b/cockatrice/src/game/zones/view_zone_logic.cpp similarity index 98% rename from cockatrice/src/game/zones/logic/view_zone_logic.cpp rename to cockatrice/src/game/zones/view_zone_logic.cpp index 5a4db3163..d025fc841 100644 --- a/cockatrice/src/game/zones/logic/view_zone_logic.cpp +++ b/cockatrice/src/game/zones/view_zone_logic.cpp @@ -1,7 +1,7 @@ #include "view_zone_logic.h" -#include "../../../client/settings/cache_settings.h" -#include "../../board/card_item.h" +#include "../../client/settings/cache_settings.h" +#include "../board/card_item.h" /** * @param _player the player that the cards are revealed to. diff --git a/cockatrice/src/game/zones/logic/view_zone_logic.h b/cockatrice/src/game/zones/view_zone_logic.h similarity index 100% rename from cockatrice/src/game/zones/logic/view_zone_logic.h rename to cockatrice/src/game/zones/view_zone_logic.h diff --git a/cockatrice/src/game/zones/card_zone.cpp b/cockatrice/src/game_graphics/zones/card_zone.cpp similarity index 97% rename from cockatrice/src/game/zones/card_zone.cpp rename to cockatrice/src/game_graphics/zones/card_zone.cpp index 3457b681e..6ba8abe42 100644 --- a/cockatrice/src/game/zones/card_zone.cpp +++ b/cockatrice/src/game_graphics/zones/card_zone.cpp @@ -1,6 +1,6 @@ #include "card_zone.h" -#include "../board/card_item.h" +#include "../../game/board/card_item.h" #include "view_zone.h" #include diff --git a/cockatrice/src/game/zones/card_zone.h b/cockatrice/src/game_graphics/zones/card_zone.h similarity index 92% rename from cockatrice/src/game/zones/card_zone.h rename to cockatrice/src/game_graphics/zones/card_zone.h index 5df48f7fb..80226de3c 100644 --- a/cockatrice/src/game/zones/card_zone.h +++ b/cockatrice/src/game_graphics/zones/card_zone.h @@ -7,9 +7,9 @@ #ifndef CARDZONE_H #define CARDZONE_H -#include "../../game_graphics/board/abstract_graphics_item.h" -#include "../../game_graphics/board/graphics_item_type.h" -#include "logic/card_zone_logic.h" +#include "../../game/zones/card_zone_logic.h" +#include "../board/abstract_graphics_item.h" +#include "../board/graphics_item_type.h" #include #include diff --git a/cockatrice/src/game/zones/hand_zone.cpp b/cockatrice/src/game_graphics/zones/hand_zone.cpp similarity index 96% rename from cockatrice/src/game/zones/hand_zone.cpp rename to cockatrice/src/game_graphics/zones/hand_zone.cpp index 3d676dbb5..8bae6ed0a 100644 --- a/cockatrice/src/game/zones/hand_zone.cpp +++ b/cockatrice/src/game_graphics/zones/hand_zone.cpp @@ -1,11 +1,11 @@ #include "hand_zone.h" #include "../../client/settings/cache_settings.h" +#include "../../game/board/card_drag_item.h" +#include "../../game/board/card_item.h" +#include "../../game/player/player.h" +#include "../../game/player/player_actions.h" #include "../../interface/theme_manager.h" -#include "../board/card_drag_item.h" -#include "../board/card_item.h" -#include "../player/player.h" -#include "../player/player_actions.h" #include #include diff --git a/cockatrice/src/game/zones/hand_zone.h b/cockatrice/src/game_graphics/zones/hand_zone.h similarity index 95% rename from cockatrice/src/game/zones/hand_zone.h rename to cockatrice/src/game_graphics/zones/hand_zone.h index 586302308..c3f3f252b 100644 --- a/cockatrice/src/game/zones/hand_zone.h +++ b/cockatrice/src/game_graphics/zones/hand_zone.h @@ -7,7 +7,7 @@ #ifndef HANDZONE_H #define HANDZONE_H -#include "logic/hand_zone_logic.h" +#include "../../game/zones/hand_zone_logic.h" #include "select_zone.h" class HandZone : public SelectZone diff --git a/cockatrice/src/game/zones/pile_zone.cpp b/cockatrice/src/game_graphics/zones/pile_zone.cpp similarity index 95% rename from cockatrice/src/game/zones/pile_zone.cpp rename to cockatrice/src/game_graphics/zones/pile_zone.cpp index 33538ab28..cbc312d0c 100644 --- a/cockatrice/src/game/zones/pile_zone.cpp +++ b/cockatrice/src/game_graphics/zones/pile_zone.cpp @@ -1,10 +1,10 @@ #include "pile_zone.h" -#include "../board/card_drag_item.h" -#include "../board/card_item.h" -#include "../player/player.h" -#include "../player/player_actions.h" -#include "logic/pile_zone_logic.h" +#include "../../game/board/card_drag_item.h" +#include "../../game/board/card_item.h" +#include "../../game/player/player.h" +#include "../../game/player/player_actions.h" +#include "../../game/zones/pile_zone_logic.h" #include "view_zone.h" #include diff --git a/cockatrice/src/game/zones/pile_zone.h b/cockatrice/src/game_graphics/zones/pile_zone.h similarity index 96% rename from cockatrice/src/game/zones/pile_zone.h rename to cockatrice/src/game_graphics/zones/pile_zone.h index 5bfc50880..8cf04676d 100644 --- a/cockatrice/src/game/zones/pile_zone.h +++ b/cockatrice/src/game_graphics/zones/pile_zone.h @@ -7,8 +7,8 @@ #ifndef PILEZONE_H #define PILEZONE_H +#include "../../game/zones/pile_zone_logic.h" #include "card_zone.h" -#include "logic/pile_zone_logic.h" /** * A CardZone where the cards are in a single pile instead of being laid out. diff --git a/cockatrice/src/game/zones/select_zone.cpp b/cockatrice/src/game_graphics/zones/select_zone.cpp similarity index 99% rename from cockatrice/src/game/zones/select_zone.cpp rename to cockatrice/src/game_graphics/zones/select_zone.cpp index e85ec17ae..d43753603 100644 --- a/cockatrice/src/game/zones/select_zone.cpp +++ b/cockatrice/src/game_graphics/zones/select_zone.cpp @@ -1,8 +1,8 @@ #include "select_zone.h" #include "../../client/settings/cache_settings.h" -#include "../board/card_item.h" -#include "../game_scene.h" +#include "../../game/board/card_item.h" +#include "../../game/game_scene.h" #include #include diff --git a/cockatrice/src/game/zones/select_zone.h b/cockatrice/src/game_graphics/zones/select_zone.h similarity index 100% rename from cockatrice/src/game/zones/select_zone.h rename to cockatrice/src/game_graphics/zones/select_zone.h diff --git a/cockatrice/src/game/zones/stack_zone.cpp b/cockatrice/src/game_graphics/zones/stack_zone.cpp similarity index 91% rename from cockatrice/src/game/zones/stack_zone.cpp rename to cockatrice/src/game_graphics/zones/stack_zone.cpp index c0da0bfd2..b4c00e04e 100644 --- a/cockatrice/src/game/zones/stack_zone.cpp +++ b/cockatrice/src/game_graphics/zones/stack_zone.cpp @@ -1,12 +1,12 @@ #include "stack_zone.h" +#include "../../game/board/card_drag_item.h" +#include "../../game/board/card_item.h" +#include "../../game/card_dimensions.h" +#include "../../game/player/player.h" +#include "../../game/player/player_actions.h" +#include "../../game/zones/stack_zone_logic.h" #include "../../interface/theme_manager.h" -#include "../board/card_drag_item.h" -#include "../board/card_item.h" -#include "../card_dimensions.h" -#include "../player/player.h" -#include "../player/player_actions.h" -#include "logic/stack_zone_logic.h" #include #include diff --git a/cockatrice/src/game/zones/stack_zone.h b/cockatrice/src/game_graphics/zones/stack_zone.h similarity index 94% rename from cockatrice/src/game/zones/stack_zone.h rename to cockatrice/src/game_graphics/zones/stack_zone.h index 8f5bed09d..ed13ae1f9 100644 --- a/cockatrice/src/game/zones/stack_zone.h +++ b/cockatrice/src/game_graphics/zones/stack_zone.h @@ -7,7 +7,7 @@ #ifndef STACKZONE_H #define STACKZONE_H -#include "logic/stack_zone_logic.h" +#include "../../game/zones/stack_zone_logic.h" #include "select_zone.h" class StackZone : public SelectZone diff --git a/cockatrice/src/game/zones/table_zone.cpp b/cockatrice/src/game_graphics/zones/table_zone.cpp similarity index 97% rename from cockatrice/src/game/zones/table_zone.cpp rename to cockatrice/src/game_graphics/zones/table_zone.cpp index 5e7db3d09..d428a8a33 100644 --- a/cockatrice/src/game/zones/table_zone.cpp +++ b/cockatrice/src/game_graphics/zones/table_zone.cpp @@ -1,14 +1,14 @@ #include "table_zone.h" #include "../../client/settings/cache_settings.h" +#include "../../game/board/arrow_item.h" +#include "../../game/board/card_drag_item.h" +#include "../../game/board/card_item.h" +#include "../../game/player/player.h" +#include "../../game/player/player_actions.h" +#include "../../game/z_values.h" +#include "../../game/zones/table_zone_logic.h" #include "../../interface/theme_manager.h" -#include "../board/arrow_item.h" -#include "../board/card_drag_item.h" -#include "../board/card_item.h" -#include "../player/player.h" -#include "../player/player_actions.h" -#include "../z_values.h" -#include "logic/table_zone_logic.h" #include #include diff --git a/cockatrice/src/game/zones/table_zone.h b/cockatrice/src/game_graphics/zones/table_zone.h similarity index 98% rename from cockatrice/src/game/zones/table_zone.h rename to cockatrice/src/game_graphics/zones/table_zone.h index 7a53a9eb4..b5e941782 100644 --- a/cockatrice/src/game/zones/table_zone.h +++ b/cockatrice/src/game_graphics/zones/table_zone.h @@ -7,8 +7,8 @@ #ifndef TABLEZONE_H #define TABLEZONE_H -#include "../board/abstract_card_item.h" -#include "logic/table_zone_logic.h" +#include "../../game/board/abstract_card_item.h" +#include "../../game/zones/table_zone_logic.h" #include "select_zone.h" /* diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game_graphics/zones/view_zone.cpp similarity index 98% rename from cockatrice/src/game/zones/view_zone.cpp rename to cockatrice/src/game_graphics/zones/view_zone.cpp index 803f80f48..185c1cc6e 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game_graphics/zones/view_zone.cpp @@ -1,10 +1,10 @@ #include "view_zone.h" -#include "../board/card_drag_item.h" -#include "../board/card_item.h" -#include "../player/player.h" -#include "../player/player_actions.h" -#include "logic/view_zone_logic.h" +#include "../../game/board/card_drag_item.h" +#include "../../game/board/card_item.h" +#include "../../game/player/player.h" +#include "../../game/player/player_actions.h" +#include "../../game/zones/view_zone_logic.h" #include #include diff --git a/cockatrice/src/game/zones/view_zone.h b/cockatrice/src/game_graphics/zones/view_zone.h similarity index 98% rename from cockatrice/src/game/zones/view_zone.h rename to cockatrice/src/game_graphics/zones/view_zone.h index 81279c72e..65e4846d0 100644 --- a/cockatrice/src/game/zones/view_zone.h +++ b/cockatrice/src/game_graphics/zones/view_zone.h @@ -7,7 +7,7 @@ #ifndef ZONEVIEWERZONE_H #define ZONEVIEWERZONE_H -#include "logic/view_zone_logic.h" +#include "../../game/zones/view_zone_logic.h" #include "select_zone.h" #include diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp similarity index 99% rename from cockatrice/src/game/zones/view_zone_widget.cpp rename to cockatrice/src/game_graphics/zones/view_zone_widget.cpp index 5893b8405..a0e63bea0 100644 --- a/cockatrice/src/game/zones/view_zone_widget.cpp +++ b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp @@ -2,12 +2,12 @@ #include "../../client/settings/cache_settings.h" #include "../../filters/syntax_help.h" +#include "../../game/board/card_item.h" +#include "../../game/game_scene.h" +#include "../../game/player/player.h" +#include "../../game/player/player_actions.h" +#include "../../game/z_values.h" #include "../../interface/pixel_map_generator.h" -#include "../board/card_item.h" -#include "../game_scene.h" -#include "../player/player.h" -#include "../player/player_actions.h" -#include "../z_values.h" #include "view_zone.h" #include diff --git a/cockatrice/src/game/zones/view_zone_widget.h b/cockatrice/src/game_graphics/zones/view_zone_widget.h similarity index 98% rename from cockatrice/src/game/zones/view_zone_widget.h rename to cockatrice/src/game_graphics/zones/view_zone_widget.h index 1246192b8..f5c29cf7d 100644 --- a/cockatrice/src/game/zones/view_zone_widget.h +++ b/cockatrice/src/game_graphics/zones/view_zone_widget.h @@ -6,7 +6,7 @@ #ifndef ZONEVIEWWIDGET_H #define ZONEVIEWWIDGET_H -#include "logic/card_zone_logic.h" +#include "../../game/zones/card_zone_logic.h" #include #include diff --git a/tests/card_zone_algorithms/CMakeLists.txt b/tests/card_zone_algorithms/CMakeLists.txt index 889e92eaa..e03d8f77d 100644 --- a/tests/card_zone_algorithms/CMakeLists.txt +++ b/tests/card_zone_algorithms/CMakeLists.txt @@ -1,6 +1,6 @@ add_executable(card_zone_algorithms_test card_zone_algorithms_test.cpp) -target_include_directories(card_zone_algorithms_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones/logic) +target_include_directories(card_zone_algorithms_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones) target_link_libraries( card_zone_algorithms_test