jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-17 07:52:16 -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

26
libcockatrice_server/libcockatrice/server/game/server_move_card_struct.h Normal file
View file

@ -0,0 +1,26 @@
#ifndef MOVE_CARD_STRUCT
#define MOVE_CARD_STRUCT
#include "server_card.h"
class CardToMove;
struct MoveCardStruct
{
Server_Card *card;
int position;
const CardToMove *cardToMove;
int xCoord, yCoord;
MoveCardStruct(Server_Card *_card, int _position, const CardToMove *_cardToMove)
: card(_card), position(_position), cardToMove(_cardToMove), xCoord(_card->getX()), yCoord(_card->getY())
{
}
bool operator<(const MoveCardStruct &other) const
{
return (yCoord == other.yCoord &&
((xCoord == other.xCoord && position < other.position) || xCoord < other.xCoord)) ||
yCoord < other.yCoord;
}
};
#endif