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

update includes with move

Browse source
This commit is contained in:
ebbit1q 2025-09-17 15:17:40 +02:00
parent ee6940db4e
commit 74bbef53b2
24 changed files with 66 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/game/board/card_item.h
View file

@ -3,7 +3,7 @@
#include "../zones/logic/card_zone_logic.h" #include "../zones/logic/card_zone_logic.h"
#include "abstract_card_item.h" #include "abstract_card_item.h"
#include "server_card.h" #include "server/game/server_card.h"
class CardDatabase; class CardDatabase;
class CardDragItem; class CardDragItem;

2
cockatrice/src/server/local_server.cpp
View file

@ -1,7 +1,7 @@
#include "local_server.h" #include "local_server.h"
#include "local_server_interface.h" #include "local_server_interface.h"
#include "server_room.h" #include "server/server_room.h"
LocalServer::LocalServer(QObject *parent) : Server(parent) LocalServer::LocalServer(QObject *parent) : Server(parent)
{ {

4
cockatrice/src/server/local_server.h
View file

@ -1,8 +1,8 @@
#ifndef LOCALSERVER_H #ifndef LOCALSERVER_H
#define LOCALSERVER_H #define LOCALSERVER_H
#include "server.h" #include "server/server.h"
#include "server_database_interface.h" #include "server/server_database_interface.h"
class LocalServerInterface; class LocalServerInterface;

2
cockatrice/src/server/local_server_interface.h
View file

@ -1,7 +1,7 @@
#ifndef LOCALSERVERINTERFACE_H #ifndef LOCALSERVERINTERFACE_H
#define LOCALSERVERINTERFACE_H #define LOCALSERVERINTERFACE_H
#include "server_protocolhandler.h" #include "server/server_protocolhandler.h"
class LocalServer; class LocalServer;

28
common/CMakeLists.txt
View file

@ -17,20 +17,20 @@ set(common_SOURCES
passwordhasher.cpp passwordhasher.cpp
rng_abstract.cpp rng_abstract.cpp
rng_sfmt.cpp rng_sfmt.cpp
server.cpp server/game/server_arrow.cpp
server_abstractuserinterface.cpp server/game/server_arrowtarget.cpp
server_arrow.cpp server/game/server_card.cpp
server_arrowtarget.h server/game/server_cardzone.cpp
server_card.cpp server/game/server_counter.cpp
server_cardzone.cpp server/game/server_game.cpp
server_counter.cpp server/game/server_player.cpp
server_database_interface.cpp server/server.cpp
server_game.cpp server/server_abstractuserinterface.cpp
server_player.cpp server/server_database_interface.cpp
server_protocolhandler.cpp server/server_protocolhandler.cpp
server_remoteuserinterface.cpp server/server_remoteuserinterface.cpp
server_response_containers.cpp server/server_response_containers.cpp
server_room.cpp server/server_room.cpp
serverinfo_user_container.cpp serverinfo_user_container.cpp
sfmt/SFMT.c sfmt/SFMT.c
) )

2
common/server/game/server_card.h
View file

@ -20,7 +20,7 @@
#ifndef SERVER_CARD_H #ifndef SERVER_CARD_H
#define SERVER_CARD_H #define SERVER_CARD_H
#include "card_ref.h" #include "../../card_ref.h"
#include "pb/card_attributes.pb.h" #include "pb/card_attributes.pb.h"
#include "pb/serverinfo_card.pb.h" #include "pb/serverinfo_card.pb.h"
#include "server_arrowtarget.h" #include "server_arrowtarget.h"

2
common/server/game/server_cardzone.cpp
View file

@ -19,8 +19,8 @@
***************************************************************************/ ***************************************************************************/
#include "server_cardzone.h" #include "server_cardzone.h"
#include "../rng_abstract.h"
#include "pb/command_move_card.pb.h" #include "pb/command_move_card.pb.h"
#include "rng_abstract.h"
#include "server_card.h" #include "server_card.h"
#include "server_player.h" #include "server_player.h"

10
common/server/game/server_game.cpp
View file

@ -19,7 +19,11 @@
***************************************************************************/ ***************************************************************************/
#include "server_game.h" #include "server_game.h"
#include "deck_list.h" #include "../../deck_list.h"
#include "../server.h"
#include "../server_database_interface.h"
#include "../server_protocolhandler.h"
#include "../server_room.h"
#include "pb/context_connection_state_changed.pb.h" #include "pb/context_connection_state_changed.pb.h"
#include "pb/context_deck_select.pb.h" #include "pb/context_deck_select.pb.h"
#include "pb/context_ping_changed.pb.h" #include "pb/context_ping_changed.pb.h"
@ -37,14 +41,10 @@
#include "pb/event_set_active_player.pb.h" #include "pb/event_set_active_player.pb.h"
#include "pb/game_replay.pb.h" #include "pb/game_replay.pb.h"
#include "pb/serverinfo_playerping.pb.h" #include "pb/serverinfo_playerping.pb.h"
#include "server.h"
#include "server_arrow.h" #include "server_arrow.h"
#include "server_card.h" #include "server_card.h"
#include "server_cardzone.h" #include "server_cardzone.h"
#include "server_database_interface.h"
#include "server_player.h" #include "server_player.h"
#include "server_protocolhandler.h"
#include "server_room.h"
#include <QDebug> #include <QDebug>
#include <QTimer> #include <QTimer>

2
common/server/game/server_game.h
View file

@ -20,10 +20,10 @@
#ifndef SERVERGAME_H #ifndef SERVERGAME_H
#define SERVERGAME_H #define SERVERGAME_H
#include "../server_response_containers.h"
#include "pb/event_leave.pb.h" #include "pb/event_leave.pb.h"
#include "pb/response.pb.h" #include "pb/response.pb.h"
#include "pb/serverinfo_game.pb.h" #include "pb/serverinfo_game.pb.h"
#include "server_response_containers.h"
#include <QDateTime> #include <QDateTime>
#include <QMap> #include <QMap>

20
common/server/game/server_player.cpp
View file

@ -1,9 +1,15 @@
#include "server_player.h" #include "server_player.h"
#include "color.h" #include "../../color.h"
#include "deck_list.h" #include "../../deck_list.h"
#include "deck_list_card_node.h" #include "../../deck_list_card_node.h"
#include "get_pb_extension.h" #include "../../get_pb_extension.h"
#include "../../rng_abstract.h"
#include "../../trice_limits.h"
#include "../server.h"
#include "../server_abstractuserinterface.h"
#include "../server_database_interface.h"
#include "../server_room.h"
#include "pb/command_attach_card.pb.h" #include "pb/command_attach_card.pb.h"
#include "pb/command_change_zone_properties.pb.h" #include "pb/command_change_zone_properties.pb.h"
#include "pb/command_concede.pb.h" #include "pb/command_concede.pb.h"
@ -70,17 +76,11 @@
#include "pb/response_dump_zone.pb.h" #include "pb/response_dump_zone.pb.h"
#include "pb/serverinfo_player.pb.h" #include "pb/serverinfo_player.pb.h"
#include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_user.pb.h"
#include "rng_abstract.h"
#include "server.h"
#include "server_abstractuserinterface.h"
#include "server_arrow.h" #include "server_arrow.h"
#include "server_card.h" #include "server_card.h"
#include "server_cardzone.h" #include "server_cardzone.h"
#include "server_counter.h" #include "server_counter.h"
#include "server_database_interface.h"
#include "server_game.h" #include "server_game.h"
#include "server_room.h"
#include "trice_limits.h"
#include <QDebug> #include <QDebug>
#include <QRegularExpression> #include <QRegularExpression>

2
common/server/game/server_player.h
View file

@ -1,10 +1,10 @@
#ifndef PLAYER_H #ifndef PLAYER_H
#define PLAYER_H #define PLAYER_H
#include "../../serverinfo_user_container.h"
#include "pb/card_attributes.pb.h" #include "pb/card_attributes.pb.h"
#include "pb/response.pb.h" #include "pb/response.pb.h"
#include "server_arrowtarget.h" #include "server_arrowtarget.h"
#include "serverinfo_user_container.h"
#include <QList> #include <QList>
#include <QMap> #include <QMap>

9
common/server/server.cpp
View file

@ -19,18 +19,17 @@
***************************************************************************/ ***************************************************************************/
#include "server.h" #include "server.h"
#include "debug_pb_message.h" #include "../debug_pb_message.h"
#include "featureset.h" #include "../featureset.h"
#include "game/server_game.h"
#include "game/server_player.h"
#include "pb/event_connection_closed.pb.h" #include "pb/event_connection_closed.pb.h"
#include "pb/event_list_rooms.pb.h" #include "pb/event_list_rooms.pb.h"
#include "pb/event_user_joined.pb.h" #include "pb/event_user_joined.pb.h"
#include "pb/event_user_left.pb.h" #include "pb/event_user_left.pb.h"
#include "pb/isl_message.pb.h" #include "pb/isl_message.pb.h"
#include "pb/session_event.pb.h" #include "pb/session_event.pb.h"
#include "server_counter.h"
#include "server_database_interface.h" #include "server_database_interface.h"
#include "server_game.h"
#include "server_player.h"
#include "server_protocolhandler.h" #include "server_protocolhandler.h"
#include "server_remoteuserinterface.h" #include "server_remoteuserinterface.h"
#include "server_room.h" #include "server_room.h"

4
common/server/server_abstractuserinterface.cpp
View file

@ -1,10 +1,10 @@
#include "server_abstractuserinterface.h" #include "server_abstractuserinterface.h"
#include "game/server_game.h"
#include "game/server_player.h"
#include "pb/event_game_joined.pb.h" #include "pb/event_game_joined.pb.h"
#include "pb/event_game_state_changed.pb.h" #include "pb/event_game_state_changed.pb.h"
#include "server.h" #include "server.h"
#include "server_game.h"
#include "server_player.h"
#include "server_player_reference.h" #include "server_player_reference.h"
#include "server_response_containers.h" #include "server_response_containers.h"
#include "server_room.h" #include "server_room.h"

2
common/server/server_abstractuserinterface.h
View file

@ -1,9 +1,9 @@
#ifndef SERVER_ABSTRACTUSERINTERFACE #ifndef SERVER_ABSTRACTUSERINTERFACE
#define SERVER_ABSTRACTUSERINTERFACE #define SERVER_ABSTRACTUSERINTERFACE
#include "../serverinfo_user_container.h"
#include "pb/response.pb.h" #include "pb/response.pb.h"
#include "pb/server_message.pb.h" #include "pb/server_message.pb.h"
#include "serverinfo_user_container.h"
#include <QMap> #include <QMap>
#include <QMutex> #include <QMutex>

12
common/server/server_protocolhandler.cpp
View file

@ -1,8 +1,11 @@
#include "server_protocolhandler.h" #include "server_protocolhandler.h"
#include "debug_pb_message.h" #include "../debug_pb_message.h"
#include "featureset.h" #include "../featureset.h"
#include "get_pb_extension.h" #include "../get_pb_extension.h"
#include "../trice_limits.h"
#include "game/server_game.h"
#include "game/server_player.h"
#include "pb/commands.pb.h" #include "pb/commands.pb.h"
#include "pb/event_game_joined.pb.h" #include "pb/event_game_joined.pb.h"
#include "pb/event_list_rooms.pb.h" #include "pb/event_list_rooms.pb.h"
@ -18,10 +21,7 @@
#include "pb/response_login.pb.h" #include "pb/response_login.pb.h"
#include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_user.pb.h"
#include "server_database_interface.h" #include "server_database_interface.h"
#include "server_game.h"
#include "server_player.h"
#include "server_room.h" #include "server_room.h"
#include "trice_limits.h"
#include <QDateTime> #include <QDateTime>
#include <QDebug> #include <QDebug>

2
common/server/server_response_containers.cpp
View file

@ -1,6 +1,6 @@
#include "server_response_containers.h" #include "server_response_containers.h"
#include "server_game.h" #include "game/server_game.h"
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>

4
common/server/server_room.cpp
View file

@ -1,5 +1,7 @@
#include "server_room.h" #include "server_room.h"
#include "../trice_limits.h"
#include "game/server_game.h"
#include "pb/commands.pb.h" #include "pb/commands.pb.h"
#include "pb/event_join_room.pb.h" #include "pb/event_join_room.pb.h"
#include "pb/event_leave_room.pb.h" #include "pb/event_leave_room.pb.h"
@ -9,9 +11,7 @@
#include "pb/room_commands.pb.h" #include "pb/room_commands.pb.h"
#include "pb/serverinfo_chat_message.pb.h" #include "pb/serverinfo_chat_message.pb.h"
#include "pb/serverinfo_room.pb.h" #include "pb/serverinfo_room.pb.h"
#include "server_game.h"
#include "server_protocolhandler.h" #include "server_protocolhandler.h"
#include "trice_limits.h"
#include <QDateTime> #include <QDateTime>
#include <QDebug> #include <QDebug>

2
common/server/server_room.h
View file

@ -1,9 +1,9 @@
#ifndef SERVER_ROOM_H #ifndef SERVER_ROOM_H
#define SERVER_ROOM_H #define SERVER_ROOM_H
#include "../serverinfo_user_container.h"
#include "pb/response.pb.h" #include "pb/response.pb.h"
#include "pb/serverinfo_chat_message.pb.h" #include "pb/serverinfo_chat_message.pb.h"
#include "serverinfo_user_container.h"
#include <QList> #include <QList>
#include <QMap> #include <QMap>

4
servatrice/src/isl_interface.cpp
View file

@ -14,9 +14,9 @@
#include "pb/event_user_left.pb.h" #include "pb/event_user_left.pb.h"
#include "pb/event_user_message.pb.h" #include "pb/event_user_message.pb.h"
#include "pb/isl_message.pb.h" #include "pb/isl_message.pb.h"
#include "server/server_protocolhandler.h"
#include "server/server_room.h"
#include "server_logger.h" #include "server_logger.h"
#include "server_protocolhandler.h"
#include "server_room.h"
#include <QSslSocket> #include <QSslSocket>
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>

2
servatrice/src/servatrice.cpp
View file

@ -29,8 +29,8 @@
#include "pb/event_server_shutdown.pb.h" #include "pb/event_server_shutdown.pb.h"
#include "servatrice_connection_pool.h" #include "servatrice_connection_pool.h"
#include "servatrice_database_interface.h" #include "servatrice_database_interface.h"
#include "server/server_room.h"
#include "server_logger.h" #include "server_logger.h"
#include "server_room.h"
#include "serversocketinterface.h" #include "serversocketinterface.h"
#include "settingscache.h" #include "settingscache.h"
#include "smtpclient.h" #include "smtpclient.h"

2
servatrice/src/servatrice.h
View file

@ -20,7 +20,7 @@
#ifndef SERVATRICE_H #ifndef SERVATRICE_H
#define SERVATRICE_H #define SERVATRICE_H
#include "server.h" #include "server/server.h"
#include <QHostAddress> #include <QHostAddress>
#include <QMetaType> #include <QMetaType>

4
servatrice/src/servatrice_database_interface.h
View file

@ -1,8 +1,8 @@
#ifndef SERVATRICE_DATABASE_INTERFACE_H #ifndef SERVATRICE_DATABASE_INTERFACE_H
#define SERVATRICE_DATABASE_INTERFACE_H #define SERVATRICE_DATABASE_INTERFACE_H
#include "server.h" #include "server/server.h"
#include "server_database_interface.h" #include "server/server_database_interface.h"
#include <QChar> #include <QChar>
#include <QHash> #include <QHash>

6
servatrice/src/serversocketinterface.cpp
View file

@ -65,10 +65,10 @@
#include "pb/serverinfo_user.pb.h" #include "pb/serverinfo_user.pb.h"
#include "servatrice.h" #include "servatrice.h"
#include "servatrice_database_interface.h" #include "servatrice_database_interface.h"
#include "server/game/server_player.h"
#include "server/server_response_containers.h"
#include "server/server_room.h"
#include "server_logger.h" #include "server_logger.h"
#include "server_player.h"
#include "server_response_containers.h"
#include "server_room.h"
#include "settingscache.h" #include "settingscache.h"
#include "trice_limits.h" #include "trice_limits.h"
#include "version_string.h" #include "version_string.h"

2
servatrice/src/serversocketinterface.h
View file

@ -20,7 +20,7 @@
#ifndef SERVERSOCKETINTERFACE_H #ifndef SERVERSOCKETINTERFACE_H
#define SERVERSOCKETINTERFACE_H #define SERVERSOCKETINTERFACE_H
#include "server_protocolhandler.h" #include "server/server_protocolhandler.h"
#include <QHostAddress> #include <QHostAddress>
#include <QMutex> #include <QMutex>