Merge pull request #775 from Cockatrice/fix-331

Cards played face down always go untapped to main row.

cockatrice/src/player.cpp

@@ -1581,18 +1581,19 @@ void Player::playCard(CardItem *c, bool faceDown, bool tapped)
     cardToMove->set_card_id(c->getId());
     
     CardInfo *ci = c->getInfo();
-    if ((!settingsCache->getPlayToStack() && ci->getTableRow() == 3) ||
+    if (!faceDown && ((!settingsCache->getPlayToStack() && ci->getTableRow() == 3) ||
         ((settingsCache->getPlayToStack() && ci->getTableRow() != 0) &&
-        c->getZone()->getName().toStdString() != "stack")) {
+        c->getZone()->getName().toStdString() != "stack"))) {
         cmd.set_target_zone("stack");
         cmd.set_x(0);
         cmd.set_y(0);
     } else {
-        QPoint gridPoint = QPoint(-1, 2 - ci->getTableRow());
+        int tableRow = faceDown ? 2 : ci->getTableRow();
+        QPoint gridPoint = QPoint(-1, 2 - tableRow);
         cardToMove->set_face_down(faceDown);
         cardToMove->set_pt(ci->getPowTough().toStdString());
-        cardToMove->set_tapped(tapped);
-        if(ci->getTableRow() != 3)
+        cardToMove->set_tapped(faceDown ? false : tapped);
+        if (tableRow != 3)
             cmd.set_target_zone("table");
         cmd.set_x(gridPoint.x());
         cmd.set_y(gridPoint.y());
@@ -2146,7 +2147,7 @@ void Player::actHide()
 
 void Player::actPlayFacedown()
 {
-    playCard(game->getActiveCard(), true, game->getActiveCard()->getInfo()->getCipt());
+    playCard(game->getActiveCard(), true, false);
 }
 
 void Player::updateCardMenu(CardItem *card)

common/server_cardzone.cpp

@@ -85,7 +85,7 @@ void Server_CardZone::insertCardIntoCoordMap(Server_Card *card, int x, int y)
     
     coordinateMap[y].insert(x, card);
     if (!(x % 3)) {
-        if (!freePilesMap[y].contains(card->getName(), x) && card->getAttachedCards().isEmpty())
+        if (!card->getFaceDown() && !freePilesMap[y].contains(card->getName(), x) && card->getAttachedCards().isEmpty())
             freePilesMap[y].insert(card->getName(), x);
         if (freeSpaceMap[y] == x) {
             int nextFreeX = x;
@@ -141,11 +141,11 @@ Server_Card *Server_CardZone::getCard(int id, int *position, bool remove)
     }
 }
 
-int Server_CardZone::getFreeGridColumn(int x, int y, const QString &cardName) const
+int Server_CardZone::getFreeGridColumn(int x, int y, const QString &cardName, bool dontStackSameName) const
 {
     const QMap<int, Server_Card *> &coordMap = coordinateMap.value(y);
     if (x == -1) {
-        if (freePilesMap[y].contains(cardName)) {
+        if (!dontStackSameName && freePilesMap[y].contains(cardName)) {
             x = (freePilesMap[y].value(cardName) / 3) * 3;
             if (!coordMap.contains(x))
                 return x;

common/server_cardzone.h

@@ -62,7 +62,7 @@ public:
     Server_Player *getPlayer() const { return player; }
     void getInfo(ServerInfo_Zone *info, Server_Player *playerWhosAsking, bool omniscient);
     
-    int getFreeGridColumn(int x, int y, const QString &cardName) const;
+    int getFreeGridColumn(int x, int y, const QString &cardName, bool dontStackSameName) const;
     bool isColumnEmpty(int x, int y) const;
     bool isColumnStacked(int x, int y) const;
     void fixFreeSpaces(GameEventStorage &ges);

common/server_player.cpp

@@ -439,11 +439,12 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges, Server_Car
             
             card->deleteLater();
         } else {
+            card->setFaceDown(faceDown);
             if (!targetzone->hasCoords()) {
                 y = 0;
                 card->resetState();
             } else
-                newX = targetzone->getFreeGridColumn(newX, y, card->getName());
+                newX = targetzone->getFreeGridColumn(newX, y, card->getName(), faceDown);
         
             targetzone->insertCard(card, newX, y);
         
@@ -464,7 +465,6 @@ Response::ResponseCode Server_Player::moveCard(GameEventStorage &ges, Server_Car
             int oldCardId = card->getId();
             if ((faceDown && (startzone != targetzone)) || (targetzone->getPlayer() != startzone->getPlayer()))
                 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
             // are not being looked at.
@@ -1043,7 +1043,7 @@ Response::ResponseCode Server_Player::cmdAttachCard(const Command_AttachCard &cm
         if (targetzone->isColumnStacked(targetCard->getX(), targetCard->getY())) {
             CardToMove *cardToMove = new CardToMove;
             cardToMove->set_card_id(targetCard->getId());
-            targetPlayer->moveCard(ges, targetzone, QList<const CardToMove *>() << cardToMove, targetzone, targetzone->getFreeGridColumn(-2, targetCard->getY(), targetCard->getName()), targetCard->getY(), targetCard->getFaceDown());
+            targetPlayer->moveCard(ges, targetzone, QList<const CardToMove *>() << cardToMove, targetzone, targetzone->getFreeGridColumn(-2, targetCard->getY(), targetCard->getName(), false), targetCard->getY(), targetCard->getFaceDown());
             delete cardToMove;
         }
         
@@ -1080,7 +1080,7 @@ Response::ResponseCode Server_Player::cmdCreateToken(const Command_CreateToken &
     int x = cmd.x();
     int y = cmd.y();
     if (zone->hasCoords())
-        x = zone->getFreeGridColumn(x, y, cardName);
+        x = zone->getFreeGridColumn(x, y, cardName, false);
     if (x < 0)
         x = 0;
     if (y < 0)