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

format

Browse source
This commit is contained in:
ebbit1q 2025-10-08 14:13:18 +02:00
parent fe0e061bfe
commit 64bbde08b6
24 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libcockatrice_server/libcockatrice/server/game/server_card.cpp
View file

@ -21,12 +21,12 @@
#include "server_cardzone.h"
#include "server_player.h"
#include <QVariant>
#include <libcockatrice/protocol/pb/event_set_card_attr.pb.h>
#include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
#include <QVariant>
Server_Card::Server_Card(const CardRef &cardRef, int _id, int _coord_x, int _coord_y, Server_CardZone *_zone)
: zone(_zone), id(_id), coord_x(_coord_x), coord_y(_coord_y), cardRef(cardRef), tapped(false), attacking(false),
facedown(false), destroyOnZoneChange(false), doesntUntap(false), parentCard(0), stashedCard(nullptr)

3
libcockatrice_server/libcockatrice/server/game/server_cardzone.h
View file

@ -20,12 +20,11 @@
#ifndef SERVER_CARDZONE_H
#define SERVER_CARDZONE_H
#include <libcockatrice/protocol/pb/serverinfo_zone.pb.h>
#include <QList>
#include <QMap>
#include <QSet>
#include <QString>
#include <libcockatrice/protocol/pb/serverinfo_zone.pb.h>
class Server_Card;
class Server_AbstractPlayer;

3
libcockatrice_server/libcockatrice/server/game/server_counter.h
View file

@ -20,9 +20,8 @@
#ifndef SERVER_COUNTER_H
#define SERVER_COUNTER_H
#include <libcockatrice/protocol/pb/color.pb.h>
#include <QString>
#include <libcockatrice/protocol/pb/color.pb.h>
class ServerInfo_Counter;

16
libcockatrice_server/libcockatrice/server/game/server_game.cpp
View file

@ -19,16 +19,20 @@
***************************************************************************/
#include "server_game.h"
#include "../server.h"
#include "../server_database_interface.h"
#include "../server_protocolhandler.h"
#include "../server_room.h"
#include "server_abstract_player.h"
#include "server_arrow.h"
#include "server_card.h"
#include "server_cardzone.h"
#include "server_player.h"
#include "server_spectator.h"
#include "../server.h"
#include "../server_database_interface.h"
#include "../server_protocolhandler.h"
#include "../server_room.h"
#include <QDebug>
#include <QTimer>
#include <google/protobuf/descriptor.h>
#include <libcockatrice/deck_list/deck_list.h>
#include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
#include <libcockatrice/protocol/pb/context_deck_select.pb.h>
@ -48,10 +52,6 @@
#include <libcockatrice/protocol/pb/game_replay.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_playerping.pb.h>
#include <QDebug>
#include <QTimer>
#include <google/protobuf/descriptor.h>
Server_Game::Server_Game(const ServerInfo_User &_creatorInfo,
int _gameId,
const QString &_description,

6
libcockatrice_server/libcockatrice/server/game/server_game.h
View file

@ -21,9 +21,6 @@
#define SERVERGAME_H
#include "../server_response_containers.h"
#include <libcockatrice/protocol/pb/event_leave.pb.h>
#include <libcockatrice/protocol/pb/response.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
#include <QDateTime>
#include <QMap>
@ -31,6 +28,9 @@
#include <QObject>
#include <QSet>
#include <QStringList>
#include <libcockatrice/protocol/pb/event_leave.pb.h>
#include <libcockatrice/protocol/pb/response.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
class QTimer;
class GameEventContainer;

2
libcockatrice_server/libcockatrice/server/game/server_player.cpp
View file

@ -10,6 +10,7 @@
#include "server_cardzone.h"
#include "server_counter.h"
#include "server_game.h"
#include "server_move_card_struct.h"
#include <QDebug>
#include <QRegularExpression>
@ -85,7 +86,6 @@
#include <libcockatrice/rng/rng_abstract.h>
#include <libcockatrice/utility/color.h>
#include <libcockatrice/utility/trice_limits.h>
#include "server_move_card_struct.h"
Server_Player::Server_Player(Server_Game *_game,
int _playerId,