Skip to content
GitLab
Commit e40a79d9 authored by Zach's avatar Zach
Browse files

Merge pull request #900 from ctrlaltca/fix_884 

Reinstates hidden cards being hidden; fix #884
parents fb49a886 dcc6677e
Hide whitespace changes
Inline Side-by-side
common/server_player.cpp
View file @ e40a79d9
...@@ -439,7 +439,6 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges, Server_Car ...@@ -439,7 +439,6 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges, Server_Car
card->deleteLater(); card->deleteLater();
} else { } else {
card->setFaceDown(faceDown);
if (!targetzone->hasCoords()) { if (!targetzone->hasCoords()) {
y = 0; y = 0;
card->resetState(); card->resetState();
...@@ -465,6 +464,7 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges, Server_Car ...@@ -465,6 +464,7 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges, Server_Car
int oldCardId = card->getId(); int oldCardId = card->getId();
if ((faceDown && (startzone != targetzone)) || (targetzone->getPlayer() != startzone->getPlayer())) if ((faceDown && (startzone != targetzone)) || (targetzone->getPlayer() != startzone->getPlayer()))
card->setId(targetzone->getPlayer()->newCardId()); card->setId(targetzone->getPlayer()->newCardId());
card->setFaceDown(faceDown);
// The player does not get to see which card he moved if it moves between two parts of hidden zones which // The player does not get to see which card he moved if it moves between two parts of hidden zones which
// are not being looked at. // are not being looked at.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment