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

Keep Annotations on Stack

Browse source
This commit is contained in:
ZeldaZach 2024-12-31 13:37:00 -05:00
parent ded6d5b8eb
commit 75b7205310
No known key found for this signature in database
6 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/server_player.cpp
View file

@ -548,7 +548,7 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges,
newX = targetzone->getFreeGridColumn(newX, yCoord, card->getName(), faceDown);
} else {
yCoord = 0;
card->resetState();
card->resetState(targetzone->getName() == "stack");
}
targetzone->insertCard(card, newX, yCoord);
@ -576,6 +576,10 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges,
eventOthers.set_start_player_id(startzone->getPlayer()->getPlayerId());
eventOthers.set_start_zone(startzone->getName().toStdString());
eventOthers.set_target_player_id(targetzone->getPlayer()->getPlayerId());
if (targetzone->getName() == "stack") {
setCardAttrHelper(ges, targetzone->getPlayer()->getPlayerId(), targetzone->getName(), card->getId(),
AttrAnnotation, card->getAnnotation(), card);
}
if (startzone != targetzone) {
eventOthers.set_target_zone(targetzone->getName().toStdString());
}