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

move message_log_widget to game

Browse source
This commit is contained in:
ebbit1q 2025-09-19 13:21:56 +02:00
parent f484c98152
commit 5d4dfff9da
6 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/CMakeLists.txt
View file

@ -222,6 +222,7 @@ set(cockatrice_SOURCES
src/game/game_view.cpp
src/game/games_model.cpp
src/game/hand_counter.cpp
src/game/log/message_log_widget.cpp
src/game/phase.cpp
src/game/player/event_processing_options.h
src/game/player/player.cpp
@ -267,7 +268,6 @@ set(cockatrice_SOURCES
src/server/local_client.cpp
src/server/local_server.cpp
src/server/local_server_interface.cpp
src/server/message_log_widget.cpp
src/server/pending_command.cpp
src/server/remote/remote_client.cpp
src/server/remote/remote_decklist_tree_widget.cpp

2
cockatrice/src/client/tabs/tab_game.cpp
View file

@ -11,13 +11,13 @@
#include "../../game/game.h"
#include "../../game/game_scene.h"
#include "../../game/game_view.h"
#include "../../game/log/message_log_widget.h"
#include "../../game/player/player.h"
#include "../../game/player/player_list_widget.h"
#include "../../game/replay.h"
#include "../../game/zones/card_zone.h"
#include "../../main.h"
#include "../../server/abstract_client.h"
#include "../../server/message_log_widget.h"
#include "../../server/user/user_list_manager.h"
#include "../../settings/cache_settings.h"
#include "../network/replay_timeline_widget.h"

2
cockatrice/src/client/tabs/tab_game.h
View file

@ -3,8 +3,8 @@
#include "../../client/tearoff_menu.h"
#include "../../game/abstract_game.h"
#include "../../game/log/message_log_widget.h"
#include "../../game/player/player.h"
#include "../../server/message_log_widget.h"
#include "../replay_manager.h"
#include "../ui/widgets/visual_deck_storage/visual_deck_storage_widget.h"
#include "pb/event_leave.pb.h"

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

@ -2,10 +2,10 @@
#include "../client/tabs/tab_game.h"
#include "../server/abstract_client.h"
#include "../server/message_log_widget.h"
#include "../server/pending_command.h"
#include "abstract_game.h"
#include "get_pb_extension.h"
#include "log/message_log_widget.h"
#include "pb/command_concede.pb.h"
#include "pb/command_delete_arrow.pb.h"
#include "pb/command_game_say.pb.h"
@ -501,4 +501,4 @@ void GameEventHandler::eventSetActivePhase(const Event_SetActivePhase &event,
}
game->getGameState()->setCurrentPhase(phase);
emitUserEvent();
}
}

16
cockatrice/src/server/message_log_widget.cpp → cockatrice/src/game/log/message_log_widget.cpp
View file

@ -1,13 +1,13 @@
#include "message_log_widget.h"
#include "../client/sound_engine.h"
#include "../client/tabs/tab_game.h"
#include "../client/translate_counter_name.h"
#include "../game/board/card_item.h"
#include "../game/phase.h"
#include "../game/player/player.h"
#include "../game/zones/card_zone.h"
#include "../settings/card_counter_settings.h"
#include "../../client/sound_engine.h"
#include "../../client/tabs/tab_game.h"
#include "../../client/translate_counter_name.h"
#include "../../settings/card_counter_settings.h"
#include "../board/card_item.h"
#include "../phase.h"
#include "../player/player.h"
#include "../zones/card_zone.h"
#include "pb/context_move_card.pb.h"
#include "pb/context_mulligan.pb.h"
#include "pb/serverinfo_user.pb.h"

6
cockatrice/src/server/message_log_widget.h → cockatrice/src/game/log/message_log_widget.h
View file

@ -1,9 +1,9 @@
#ifndef MESSAGELOGWIDGET_H
#define MESSAGELOGWIDGET_H
#include "../client/translation.h"
#include "../game/zones/logic/card_zone_logic.h"
#include "chat_view/chat_view.h"
#include "../../client/translation.h"
#include "../../server/chat_view/chat_view.h"
#include "../zones/logic/card_zone_logic.h"
#include "user_level.h"
class AbstractGame;