From 6d3606a631680274c24143466582aac56a8e391c Mon Sep 17 00:00:00 2001 From: RickyRister Date: Sun, 20 Apr 2025 03:12:02 -0700 Subject: [PATCH] move files --- .../src/game/{cards => board}/abstract_card_drag_item.cpp | 0 .../src/game/{cards => board}/abstract_card_drag_item.h | 0 cockatrice/src/game/{cards => board}/abstract_card_item.cpp | 4 ++-- cockatrice/src/game/{cards => board}/abstract_card_item.h | 4 ++-- cockatrice/src/game/{cards => board}/card_drag_item.cpp | 0 cockatrice/src/game/{cards => board}/card_drag_item.h | 0 cockatrice/src/game/{cards => board}/card_item.cpp | 4 ++-- cockatrice/src/game/{cards => board}/card_item.h | 0 cockatrice/src/game/{cards => board}/card_list.cpp | 2 +- cockatrice/src/game/{cards => board}/card_list.h | 0 10 files changed, 7 insertions(+), 7 deletions(-) rename cockatrice/src/game/{cards => board}/abstract_card_drag_item.cpp (100%) rename cockatrice/src/game/{cards => board}/abstract_card_drag_item.h (100%) rename cockatrice/src/game/{cards => board}/abstract_card_item.cpp (99%) rename cockatrice/src/game/{cards => board}/abstract_card_item.h (98%) rename cockatrice/src/game/{cards => board}/card_drag_item.cpp (100%) rename cockatrice/src/game/{cards => board}/card_drag_item.h (100%) rename cockatrice/src/game/{cards => board}/card_item.cpp (99%) rename cockatrice/src/game/{cards => board}/card_item.h (100%) rename cockatrice/src/game/{cards => board}/card_list.cpp (99%) rename cockatrice/src/game/{cards => board}/card_list.h (100%) diff --git a/cockatrice/src/game/cards/abstract_card_drag_item.cpp b/cockatrice/src/game/board/abstract_card_drag_item.cpp similarity index 100% rename from cockatrice/src/game/cards/abstract_card_drag_item.cpp rename to cockatrice/src/game/board/abstract_card_drag_item.cpp diff --git a/cockatrice/src/game/cards/abstract_card_drag_item.h b/cockatrice/src/game/board/abstract_card_drag_item.h similarity index 100% rename from cockatrice/src/game/cards/abstract_card_drag_item.h rename to cockatrice/src/game/board/abstract_card_drag_item.h diff --git a/cockatrice/src/game/cards/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp similarity index 99% rename from cockatrice/src/game/cards/abstract_card_item.cpp rename to cockatrice/src/game/board/abstract_card_item.cpp index dc00aae66..0623afb07 100644 --- a/cockatrice/src/game/cards/abstract_card_item.cpp +++ b/cockatrice/src/game/board/abstract_card_item.cpp @@ -2,9 +2,9 @@ #include "../../client/ui/picture_loader/picture_loader.h" #include "../../settings/cache_settings.h" +#include "../cards/card_database.h" +#include "../cards/card_database_manager.h" #include "../game_scene.h" -#include "card_database.h" -#include "card_database_manager.h" #include #include diff --git a/cockatrice/src/game/cards/abstract_card_item.h b/cockatrice/src/game/board/abstract_card_item.h similarity index 98% rename from cockatrice/src/game/cards/abstract_card_item.h rename to cockatrice/src/game/board/abstract_card_item.h index 48f890701..94de7596a 100644 --- a/cockatrice/src/game/cards/abstract_card_item.h +++ b/cockatrice/src/game/board/abstract_card_item.h @@ -1,8 +1,8 @@ #ifndef ABSTRACTCARDITEM_H #define ABSTRACTCARDITEM_H -#include "../board/arrow_target.h" -#include "card_info.h" +#include "../cards/card_info.h" +#include "arrow_target.h" class Player; diff --git a/cockatrice/src/game/cards/card_drag_item.cpp b/cockatrice/src/game/board/card_drag_item.cpp similarity index 100% rename from cockatrice/src/game/cards/card_drag_item.cpp rename to cockatrice/src/game/board/card_drag_item.cpp diff --git a/cockatrice/src/game/cards/card_drag_item.h b/cockatrice/src/game/board/card_drag_item.h similarity index 100% rename from cockatrice/src/game/cards/card_drag_item.h rename to cockatrice/src/game/board/card_drag_item.h diff --git a/cockatrice/src/game/cards/card_item.cpp b/cockatrice/src/game/board/card_item.cpp similarity index 99% rename from cockatrice/src/game/cards/card_item.cpp rename to cockatrice/src/game/board/card_item.cpp index 40fa8d119..e9a345e86 100644 --- a/cockatrice/src/game/cards/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -2,14 +2,14 @@ #include "../../client/tabs/tab_game.h" #include "../../settings/cache_settings.h" -#include "../board/arrow_item.h" +#include "../cards/card_info.h" #include "../game_scene.h" #include "../player/player.h" #include "../zones/card_zone.h" #include "../zones/table_zone.h" #include "../zones/view_zone.h" +#include "arrow_item.h" #include "card_drag_item.h" -#include "card_info.h" #include "pb/serverinfo_card.pb.h" #include diff --git a/cockatrice/src/game/cards/card_item.h b/cockatrice/src/game/board/card_item.h similarity index 100% rename from cockatrice/src/game/cards/card_item.h rename to cockatrice/src/game/board/card_item.h diff --git a/cockatrice/src/game/cards/card_list.cpp b/cockatrice/src/game/board/card_list.cpp similarity index 99% rename from cockatrice/src/game/cards/card_list.cpp rename to cockatrice/src/game/board/card_list.cpp index 0eda14626..0355bf6bd 100644 --- a/cockatrice/src/game/cards/card_list.cpp +++ b/cockatrice/src/game/board/card_list.cpp @@ -1,6 +1,6 @@ #include "card_list.h" -#include "card_info.h" +#include "../cards/card_info.h" #include "card_item.h" #include diff --git a/cockatrice/src/game/cards/card_list.h b/cockatrice/src/game/board/card_list.h similarity index 100% rename from cockatrice/src/game/cards/card_list.h rename to cockatrice/src/game/board/card_list.h