jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-17 04:27:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Game] Move graphics out of game and into game_graphics (#6928)
Some checks are pending
Build Desktop / Configure (push) Waiting to run
Details
Build Desktop / Debian 13 (push) Blocked by required conditions
Details
Build Desktop / Debian 12 (push) Blocked by required conditions
Details
Build Desktop / Fedora 44 (push) Blocked by required conditions
Details
Build Desktop / Fedora 43 (push) Blocked by required conditions
Details
Build Desktop / Servatrice_Debian 12 (push) Blocked by required conditions
Details
Build Desktop / Ubuntu 26.04 (push) Blocked by required conditions
Details
Build Desktop / Ubuntu 24.04 (push) Blocked by required conditions
Details
Build Desktop / Arch (push) Blocked by required conditions
Details
Build Desktop / macOS 14 (push) Blocked by required conditions
Details
Build Desktop / macOS 15 (push) Blocked by required conditions
Details
Build Desktop / macOS 13 Intel (push) Blocked by required conditions
Details
Build Desktop / macOS 15 Debug (push) Blocked by required conditions
Details
Build Desktop / Windows 10 (push) Blocked by required conditions
Details
Build Docker Image / amd64 & arm64 (push) Waiting to run
Details

Browse source 
* [Game][Player] Pull out graphics_items out of player_logic

Took 25 seconds


Took 9 minutes

* [Game] Move graphics files into game_graphics

Took 1 minute

Took 2 minutes

Took 23 seconds

Took 1 minute

Took 2 seconds

* Include.

Took 4 minutes

Took 3 minutes

Took 4 minutes

Took 1 minute

Took 3 minutes

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-06-09 09:51:13 +02:00 • committed by GitHub
parent cbfd286908
commit da4ba222c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
116 changed files with 208 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
View file

@ -1,6 +1,6 @@
#include "card_info_display_widget.h"
#include "../../../game/board/card_item.h"
#include "../../../game_graphics/board/card_item.h"
#include "card_info_picture_widget.h"
#include "card_info_text_widget.h"

2
cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
View file

@ -1,7 +1,7 @@
#include "card_info_frame_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../game/board/card_item.h"
#include "../../../game_graphics/board/card_item.h"
#include "card_info_display_widget.h"
#include "card_info_picture_widget.h"
#include "card_info_text_widget.h"

2
cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
View file

@ -1,7 +1,7 @@
#include "card_info_picture_widget.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../game/board/card_item.h"
#include "../../../game_graphics/board/card_item.h"
#include "../../../interface/card_picture_loader/card_picture_loader.h"
#include "../../../interface/widgets/tabs/tab_supervisor.h"
#include "../../window_main.h"

2
cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
View file

@ -1,6 +1,6 @@
#include "card_info_text_widget.h"
#include "../../../game/board/card_item.h"
#include "../../../game_graphics/board/card_item.h"
#include <QGridLayout>
#include <QLabel>

26
cockatrice/src/interface/widgets/tabs/tab_game.cpp
View file

@ -1,19 +1,21 @@
#include "tab_game.h"
#include "../../../client/settings/cache_settings.h"
#include "../../../game/player/menu/card_menu.h"
#include "../game/board/arrow_item.h"
#include "../game/board/card_item.h"
#include "../game/deckview/deck_view_container.h"
#include "../game/deckview/tabbed_deck_view_container.h"
#include "../game/game.h"
#include "../game/game_scene.h"
#include "../game/game_view.h"
#include "../game/log/message_log_widget.h"
#include "../game/phases_toolbar.h"
#include "../game/player/player_list_widget.h"
#include "../game/player/player_logic.h"
#include "../game/replay.h"
#include "../game_graphics/board/arrow_item.h"
#include "../game_graphics/board/card_item.h"
#include "../game_graphics/deckview/deck_view_container.h"
#include "../game_graphics/deckview/tabbed_deck_view_container.h"
#include "../game_graphics/game_scene.h"
#include "../game_graphics/game_view.h"
#include "../game_graphics/log/message_log_widget.h"
#include "../game_graphics/phases_toolbar.h"
#include "../game_graphics/player/menu/card_menu.h"
#include "../game_graphics/player/menu/player_menu.h"
#include "../game_graphics/player/player_graphics_item.h"
#include "../game_graphics/player/player_list_widget.h"
#include "../interface/card_picture_loader/card_picture_loader.h"
#include "../interface/widgets/cards/card_info_frame_widget.h"
#include "../interface/widgets/dialogs/dlg_create_game.h"
@ -48,7 +50,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
: Tab(_tabSupervisor), sayLabel(nullptr), sayEdit(nullptr)
{
// THIS CTOR IS USED ON REPLAY
game = new Replay(this, _replay);
game = new Replay(this, _replay, tabSupervisor->getIsLocalGame());
createCardInfoDock(true);
createPlayerListDock(true);
@ -92,7 +94,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor,
: Tab(_tabSupervisor), userListProxy(_tabSupervisor->getUserListManager())
{
// THIS CTOR IS USED ON GAMES
game = new Game(this, _clients, event, _roomGameTypes);
game = new Game(this, tabSupervisor->getIsLocalGame(), _clients, event, _roomGameTypes);
createCardInfoDock();
createPlayerListDock();

3
cockatrice/src/interface/widgets/tabs/tab_game.h
View file

@ -10,8 +10,8 @@
#define TAB_GAME_H
#include "../game/abstract_game.h"
#include "../game/log/message_log_widget.h"
#include "../game/player/player_logic.h"
#include "../game_graphics/log/message_log_widget.h"
#include "../interface/widgets/menus/tearoff_menu.h"
#include "../interface/widgets/replay/replay_manager.h"
#include "tab.h"
@ -20,6 +20,7 @@
#include <QLoggingCategory>
#include <QMap>
class CardMenu;
class ServerInfo_PlayerProperties;
class TabbedDeckViewContainer;
inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game");