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

Resolve merge conflicts.

Browse source 
Took 10 minutes

Took 50 seconds

Took 51 seconds

Took 2 minutes

Took 1 minute
This commit is contained in:
Lukas Brübach 2025-10-08 10:01:24 +02:00
commit c5072a013b
30 changed files with 3862 additions and 3148 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,15 +19,15 @@
***************************************************************************/
#include "server_cardzone.h"
#include "server_abstract_player.h"
#include "server_card.h"
#include "server_player.h"
#include <QDebug>
#include <QSet>
#include <libcockatrice/protocol/pb/command_move_card.pb.h>
#include <libcockatrice/rng/rng_abstract.h>
Server_CardZone::Server_CardZone(Server_Player *_player,
Server_CardZone::Server_CardZone(Server_AbstractPlayer *_player,
const QString &_name,
bool _has_coords,
ServerInfo_Zone::ZoneType _type)