jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-01 19:13:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

squash #6158 (#6160)

Browse source 
* move message_log_widget to game

* move files

* update headers

* fix cmakelists

* oracle fixes

* split implementation out to cpp

* fix recursive import

* fix main file

* format
This commit is contained in:
ebbit1q 2025-09-20 14:35:52 +02:00 • committed by GitHub
parent f484c98152
commit 17dcaf9afa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
337 changed files with 728 additions and 721 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/game/player/menu/card_menu.cpp
View file

@ -1,8 +1,8 @@
#include "card_menu.h"
#include "../../../client/tabs/tab_game.h"
#include "../../../database/card_database_manager.h"
#include "../../../settings/card_counter_settings.h"
#include "../../../tabs/tab_game.h"
#include "../../board/card_item.h"
#include "../../zones/logic/view_zone_logic.h"
#include "../card_menu_action_type.h"

2
cockatrice/src/game/player/menu/grave_menu.h
View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_GRAVE_MENU_H
#define COCKATRICE_GRAVE_MENU_H
#include "../../../client/tearoff_menu.h"
#include "../../../interface/tearoff_menu.h"
#include <QAction>
#include <QMenu>

2
cockatrice/src/game/player/menu/hand_menu.h
View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_HAND_MENU_H
#define COCKATRICE_HAND_MENU_H
#include "../../../client/tearoff_menu.h"
#include "../../../interface/tearoff_menu.h"
#include <QAction>
#include <QMenu>

2
cockatrice/src/game/player/menu/library_menu.h
View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_LIBRARY_MENU_H
#define COCKATRICE_LIBRARY_MENU_H
#include "../../../client/tearoff_menu.h"
#include "../../../interface/tearoff_menu.h"
#include <QAction>
#include <QMenu>

2
cockatrice/src/game/player/menu/player_menu.cpp
View file

@ -1,8 +1,8 @@
#include "player_menu.h"
#include "../../../client/tabs/tab_game.h"
#include "../../../common/pb/command_reveal_cards.pb.h"
#include "../../../database/card_database_manager.h"
#include "../../../tabs/tab_game.h"
#include "../../board/card_item.h"
#include "../../zones/hand_zone.h"
#include "../card_menu_action_type.h"

2
cockatrice/src/game/player/menu/player_menu.h
View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_PLAYER_MENU_H
#define COCKATRICE_PLAYER_MENU_H
#include "../../../client/tearoff_menu.h"
#include "../../../interface/tearoff_menu.h"
#include "../player.h"
#include "custom_zone_menu.h"
#include "grave_menu.h"

2
cockatrice/src/game/player/menu/rfg_menu.h
View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_RFG_MENU_H
#define COCKATRICE_RFG_MENU_H
#include "../../../client/tearoff_menu.h"
#include "../../../interface/tearoff_menu.h"
#include <QAction>
#include <QMenu>

4
cockatrice/src/game/player/player.cpp
View file

@ -1,7 +1,7 @@
#include "player.h"
#include "../../client/tabs/tab_game.h"
#include "../../client/ui/theme_manager.h"
#include "../../interface/theme_manager.h"
#include "../../tabs/tab_game.h"
#include "../board/arrow_item.h"
#include "../board/card_item.h"
#include "../board/card_list.h"

4
cockatrice/src/game/player/player.h
View file

@ -2,10 +2,10 @@
#define PLAYER_H
#include "../../card/card_info.h"
#include "../../client/tearoff_menu.h"
#include "../../dialogs/dlg_create_token.h"
#include "../../filters/filter_string.h"
#include "../../interface/tearoff_menu.h"
#include "../board/abstract_graphics_item.h"
#include "../dialogs/dlg_create_token.h"
#include "menu/player_menu.h"
#include "pb/card_attributes.pb.h"
#include "pb/game_event.pb.h"

6
cockatrice/src/game/player/player_actions.cpp
View file

@ -2,11 +2,11 @@
#include "../../../common/pb/context_move_card.pb.h"
#include "../../client/get_text_with_max.h"
#include "../../client/tabs/tab_game.h"
#include "../../database/card_database_manager.h"
#include "../../dialogs/dlg_move_top_cards_until.h"
#include "../../dialogs/dlg_roll_dice.h"
#include "../../tabs/tab_game.h"
#include "../board/card_item.h"
#include "../dialogs/dlg_move_top_cards_until.h"
#include "../dialogs/dlg_roll_dice.h"
#include "../zones/logic/view_zone_logic.h"
#include "card_menu_action_type.h"
#include "pb/command_attach_card.pb.h"

2
cockatrice/src/game/player/player_area.cpp
View file

@ -1,6 +1,6 @@
#include "player_area.h"
#include "../../client/ui/theme_manager.h"
#include "../../interface/theme_manager.h"
#include <QPainter>

2
cockatrice/src/game/player/player_event_handler.cpp
View file

@ -1,6 +1,6 @@
#include "player_event_handler.h"
#include "../../client/tabs/tab_game.h"
#include "../../tabs/tab_game.h"
#include "../board/arrow_item.h"
#include "../board/card_item.h"
#include "../board/card_list.h"

2
cockatrice/src/game/player/player_graphics_item.cpp
View file

@ -1,6 +1,6 @@
#include "player_graphics_item.h"
#include "../../client/tabs/tab_game.h"
#include "../../tabs/tab_game.h"
#include "../hand_counter.h"
PlayerGraphicsItem::PlayerGraphicsItem(Player *_player) : player(_player)

8
cockatrice/src/game/player/player_list_widget.cpp
View file

@ -1,13 +1,13 @@
#include "player_list_widget.h"
#include "../../client/tabs/tab_account.h"
#include "../../client/tabs/tab_game.h"
#include "../../client/tabs/tab_supervisor.h"
#include "../../client/ui/pixel_map_generator.h"
#include "../../interface/pixel_map_generator.h"
#include "../../server/abstract_client.h"
#include "../../server/user/user_context_menu.h"
#include "../../server/user/user_list_manager.h"
#include "../../server/user/user_list_widget.h"
#include "../../tabs/tab_account.h"
#include "../../tabs/tab_game.h"
#include "../../tabs/tab_supervisor.h"
#include "pb/command_kick_from_game.pb.h"
#include "pb/serverinfo_playerproperties.pb.h"
#include "pb/session_commands.pb.h"

2
cockatrice/src/game/player/player_target.cpp
View file

@ -1,6 +1,6 @@
#include "player_target.h"
#include "../../client/ui/pixel_map_generator.h"
#include "../../interface/pixel_map_generator.h"
#include "pb/serverinfo_user.pb.h"
#include "player.h"