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

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

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

@ -36,7 +36,7 @@ class QTimer;
class GameEventContainer;
class GameReplay;
class Server_Room;
class Server_Player;
class Server_AbstractPlayer;
class Server_AbstractParticipant;
class ServerInfo_User;
class ServerInfo_Game;
@ -130,8 +130,8 @@ public:
}
int getPlayerCount() const;
int getSpectatorCount() const;
QMap<int, Server_Player *> getPlayers() const;
Server_Player *getPlayer(int id) const;
QMap<int, Server_AbstractPlayer *> getPlayers() const;
Server_AbstractPlayer *getPlayer(int id) const;
const QMap<int, Server_AbstractParticipant *> &getParticipants() const
{
return participants;
@ -185,8 +185,8 @@ public:
bool judge,
bool broadcastUpdate = true);
void removeParticipant(Server_AbstractParticipant *participant, Event_Leave::LeaveReason reason);
void removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_Player *player);
void unattachCards(GameEventStorage &ges, Server_Player *player);
void removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_AbstractPlayer *player);
void unattachCards(GameEventStorage &ges, Server_AbstractPlayer *player);
bool kickParticipant(int playerId);
void startGameIfReady(bool forceStartGame);
void stopGameIfFinished();