jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-13 01:24:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "fix card moving on server (#4413)"

Browse source 
This reverts commit c25bf491e4.
This commit is contained in:
ZeldaZach 2021-11-15 00:54:21 -05:00
parent 691bcb9338
commit 8b1daa21ef
4 changed files with 133 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/server_cardzone.h
View file

@ -37,7 +37,7 @@ class Server_CardZone
private:
Server_Player *player;
QString name;
bool has_coords; // having coords means this zone has x and y coordinates
bool has_coords;
ServerInfo_Zone::ZoneType type;
int cardsBeingLookedAt;
QSet<int> playersWithWritePermission;
@ -59,7 +59,6 @@ public:
return cards;
}
int removeCard(Server_Card *card);
int removeCard(Server_Card *card, bool &wasLookedAt);
Server_Card *getCard(int id, int *position = nullptr, bool remove = false);
int getCardsBeingLookedAt() const
@ -70,7 +69,6 @@ public:
{
cardsBeingLookedAt = _cardsBeingLookedAt;
}
bool isCardAtPosLookedAt(int pos) const;
bool hasCoords() const
{
return has_coords;