aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Retain lastDrawList if a card is being moved within hand, e.g. hand reordering only. (#4152)

Browse source
This commit is contained in:
knitknit 2020-11-01 15:02:17 -05:00 committed by GitHub
parent ef78fdf342
commit 8e9d4e3a67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
common/server_player.cpp
View file

@ -149,9 +149,9 @@ void Server_Player::setupZones()
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// Create zones // Create zones
Server_CardZone *deckZone = new Server_CardZone(this, "deck", false, ServerInfo_Zone::HiddenZone); auto *deckZone = new Server_CardZone(this, "deck", false, ServerInfo_Zone::HiddenZone);
addZone(deckZone); addZone(deckZone);
Server_CardZone *sbZone = new Server_CardZone(this, "sb", false, ServerInfo_Zone::HiddenZone); auto *sbZone = new Server_CardZone(this, "sb", false, ServerInfo_Zone::HiddenZone);
addZone(sbZone); addZone(sbZone);
addZone(new Server_CardZone(this, "table", true, ServerInfo_Zone::PublicZone)); addZone(new Server_CardZone(this, "table", true, ServerInfo_Zone::PublicZone));
addZone(new Server_CardZone(this, "hand", false, ServerInfo_Zone::PrivateZone)); addZone(new Server_CardZone(this, "hand", false, ServerInfo_Zone::PrivateZone));
@ -424,12 +424,13 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges,
int originalPosition = cardsToMove[cardIndex].second; int originalPosition = cardsToMove[cardIndex].second;
int position = startzone->removeCard(card); int position = startzone->removeCard(card);
if (startzone->getName() == "hand") {
if (undoingDraw) { // "Undo draw" should only remain valid if the just-drawn card stays within the user's hand (e.g., they only
lastDrawList.removeAt(lastDrawList.indexOf(card->getId())); // reorder their hand). If a just-drawn card leaves the hand then clear lastDrawList to invalidate "undo draw."
} else if (lastDrawList.contains(card->getId())) { // (Ignore the case where the card is currently being un-drawn.)
lastDrawList.clear(); if (startzone->getName() == "hand" && targetzone->getName() != "hand" && lastDrawList.contains(card->getId()) &&
} !undoingDraw) {
lastDrawList.clear();
} }
if ((startzone == targetzone) && !startzone->hasCoords()) { if ((startzone == targetzone) && !startzone->hasCoords()) {
@ -1340,7 +1341,7 @@ Server_Player::cmdCreateToken(const Command_CreateToken &cmd, ResponseContainer
y = 0; y = 0;
} }
Server_Card *card = new Server_Card(cardName, newCardId(), x, y); auto *card = new Server_Card(cardName, newCardId(), x, y);
card->moveToThread(thread()); card->moveToThread(thread());
card->setPT(QString::fromStdString(cmd.pt())); card->setPT(QString::fromStdString(cmd.pt()));
card->setColor(QString::fromStdString(cmd.color())); card->setColor(QString::fromStdString(cmd.color()));
@ -1624,8 +1625,8 @@ Server_Player::cmdCreateCounter(const Command_CreateCounter &cmd, ResponseContai
return Response::RespContextError; return Response::RespContextError;
} }
Server_Counter *c = new Server_Counter(newCounterId(), QString::fromStdString(cmd.counter_name()), auto *c = new Server_Counter(newCounterId(), QString::fromStdString(cmd.counter_name()), cmd.counter_color(),
cmd.counter_color(), cmd.radius(), cmd.value()); cmd.radius(), cmd.value());
addCounter(c); addCounter(c);
Event_CreateCounter event; Event_CreateCounter event;