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

Fix pbs and some other stuff.

Browse source 
Took 1 hour 5 minutes
This commit is contained in:
Lukas Brübach 2025-10-04 20:06:57 +02:00
parent 01378b8314
commit 408b732854
84 changed files with 181 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libs/server/src/game/server_abstract_participant.cpp
View file

@ -1,21 +1,18 @@
#include "../../include/game/server_abstract_participant.h"
#include "../../include/server/game/server_abstract_participant.h"
#include "../../color.h"
#include "../../deck_list.h"
#include "../../deck_list_card_node.h"
#include "../../game/server_arrow.h"
#include "../../game/server_counter.h"
#include "../../get_pb_extension.h"
#include "../../include/game/server_card.h"
#include "../../include/game/server_cardzone.h"
#include "../../include/game/server_game.h"
#include "../../include/game/server_player.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 "../../include/server/game/server_arrow.h"
#include "../../include/server/game/server_card.h"
#include "../../include/server/game/server_cardzone.h"
#include "../../include/server/game/server_counter.h"
#include "../../include/server/game/server_game.h"
#include "../../include/server/game/server_player.h"
#include "../../include/server/get_pb_extension.h"
#include "../../include/server/server.h"
#include "../../include/server/server_database_interface.h"
#include "../../include/server/server_room.h"
#include "../include/server/server_abstractuserinterface.h"
#include "deck_list/deck_list.h"
#include "deck_list/deck_list_card_node.h"
#include "pb/command_attach_card.pb.h"
#include "pb/command_change_zone_properties.pb.h"
#include "pb/command_concede.pb.h"
@ -82,6 +79,9 @@
#include "pb/response_dump_zone.pb.h"
#include "pb/serverinfo_player.pb.h"
#include "pb/serverinfo_user.pb.h"
#include "rng/rng_abstract.h"
#include "utility/color.h"
#include "utility/trice_limits.h"
#include <QDebug>
#include <QRegularExpression>

8
libs/server/src/game/server_arrow.cpp
View file

@ -1,8 +1,8 @@
#include "../../include/game/server_arrow.h"
#include "../../include/server/game/server_arrow.h"
#include "../../include/game/server_card.h"
#include "../../include/game/server_cardzone.h"
#include "../../include/game/server_player.h"
#include "../../include/server/game/server_card.h"
#include "../../include/server/game/server_cardzone.h"
#include "../../include/server/game/server_player.h"
#include "pb/serverinfo_arrow.pb.h"
Server_Arrow::Server_Arrow(int _id, Server_Card *_startCard, Server_ArrowTarget *_targetItem, const color &_arrowColor)

2
libs/server/src/game/server_arrowtarget.cpp
View file

@ -1,2 +1,2 @@
#include "../../include/game/server_arrowtarget.h"
#include "../../include/server/game/server_arrowtarget.h"

6
libs/server/src/game/server_card.cpp
View file

@ -17,10 +17,10 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "../../include/game/server_card.h"
#include "../../include/server/game/server_card.h"
#include "../../include/game/server_cardzone.h"
#include "../../include/game/server_player.h"
#include "../../include/server/game/server_cardzone.h"
#include "../../include/server/game/server_player.h"
#include "pb/event_set_card_attr.pb.h"
#include "pb/event_set_card_counter.pb.h"
#include "pb/serverinfo_card.pb.h"

8
libs/server/src/game/server_cardzone.cpp
View file

@ -17,12 +17,12 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "../../include/game/server_cardzone.h"
#include "../../include/server/game/server_cardzone.h"
#include "../../include/game/server_card.h"
#include "../../include/game/server_player.h"
#include "../rng_abstract.h"
#include "../../include/server/game/server_card.h"
#include "../../include/server/game/server_player.h"
#include "pb/command_move_card.pb.h"
#include "rng/rng_abstract.h"
#include <QDebug>
#include <QSet>

2
libs/server/src/game/server_counter.cpp
View file

@ -1,4 +1,4 @@
#include "../../include/game/server_counter.h"
#include "../../include/server/game/server_counter.h"
#include "pb/serverinfo_counter.pb.h"

22
libs/server/src/game/server_game.cpp
View file

@ -17,18 +17,18 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "../../include/game/server_game.h"
#include "../../include/server/game/server_game.h"
#include "../../deck_list.h"
#include "../../include/game/server_arrow.h"
#include "../../include/game/server_card.h"
#include "../../include/game/server_cardzone.h"
#include "../../include/game/server_player.h"
#include "../../include/game/server_spectator.h"
#include "../server.h"
#include "../server_database_interface.h"
#include "../server_protocolhandler.h"
#include "../server_room.h"
#include "../../include/server/game/server_arrow.h"
#include "../../include/server/game/server_card.h"
#include "../../include/server/game/server_cardzone.h"
#include "../../include/server/game/server_player.h"
#include "../../include/server/game/server_spectator.h"
#include "../../include/server/server.h"
#include "../../include/server/server_database_interface.h"
#include "../../include/server/server_protocolhandler.h"
#include "../../include/server/server_room.h"
#include "deck_list/deck_list.h"
#include "pb/context_connection_state_changed.pb.h"
#include "pb/context_deck_select.pb.h"
#include "pb/context_ping_changed.pb.h"

32
libs/server/src/game/server_player.cpp
View file

@ -1,20 +1,17 @@
#include "../../include/game/server_player.h"
#include "../../include/server/game/server_player.h"
#include "../../color.h"
#include "../../deck_list.h"
#include "../../deck_list_card_node.h"
#include "../../get_pb_extension.h"
#include "../../include/game/server_arrow.h"
#include "../../include/game/server_card.h"
#include "../../include/game/server_cardzone.h"
#include "../../include/game/server_counter.h"
#include "../../include/game/server_game.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 "../../include/server/game/server_arrow.h"
#include "../../include/server/game/server_card.h"
#include "../../include/server/game/server_cardzone.h"
#include "../../include/server/game/server_counter.h"
#include "../../include/server/game/server_game.h"
#include "../../include/server/get_pb_extension.h"
#include "../../include/server/server.h"
#include "../../include/server/server_database_interface.h"
#include "../../include/server/server_room.h"
#include "../include/server/server_abstractuserinterface.h"
#include "deck_list/deck_list.h"
#include "deck_list/deck_list_card_node.h"
#include "pb/command_attach_card.pb.h"
#include "pb/command_change_zone_properties.pb.h"
#include "pb/command_concede.pb.h"
@ -81,6 +78,9 @@
#include "pb/response_dump_zone.pb.h"
#include "pb/serverinfo_player.pb.h"
#include "pb/serverinfo_user.pb.h"
#include "rng/rng_abstract.h"
#include "utility/color.h"
#include "utility/trice_limits.h"
#include <QDebug>
#include <QRegularExpression>

2
libs/server/src/game/server_spectator.cpp
View file

@ -1,4 +1,4 @@
#include "../../include/game/server_spectator.h"
#include "../../include/server/game/server_spectator.h"
Server_Spectator::Server_Spectator(Server_Game *_game,
int _playerId,