jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 09:04:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix #1652 ; fix #467

Browse source
This commit is contained in:
Fabio Bas 2015-10-20 19:29:04 +02:00
parent 613f712974
commit ea5666c443
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/server_cardzone.cpp
View file

@ -147,7 +147,12 @@ int Server_CardZone::getFreeGridColumn(int x, int y, const QString &cardName, bo
if (x == -1) { if (x == -1) {
if (!dontStackSameName && freePilesMap[y].contains(cardName)) { if (!dontStackSameName && freePilesMap[y].contains(cardName)) {
x = (freePilesMap[y].value(cardName) / 3) * 3; x = (freePilesMap[y].value(cardName) / 3) * 3;
if (!coordMap.contains(x))
if(coordMap.contains(x) &&
(coordMap[x]->getFaceDown() ||
!coordMap[x]->getAttachedCards().isEmpty())) {
// don't pile up on: 1. facedown cards 2. cards with attached cards
} else if (!coordMap.contains(x))
return x; return x;
else if (!coordMap.contains(x + 1)) else if (!coordMap.contains(x + 1))
return x + 1; return x + 1;