jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

filter running games; minor server code cleanup

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-07-03 16:45:52 +02:00
parent 9727a38956
commit 898623f1ba
24 changed files with 369 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/server_player.cpp
View file

@ -127,7 +127,7 @@ void Server_Player::setupZones()
if (!currentCard)
continue;
for (int k = 0; k < currentCard->getNumber(); ++k)
z->cards.append(new Server_Card(currentCard->getName(), nextCardId++, 0, 0));
z->cards.append(new Server_Card(currentCard->getName(), nextCardId++, 0, 0, z));
}
}
@ -334,7 +334,7 @@ ResponseCode Server_Player::moveCard(CommandContainer *cont, Server_CardZone *st
QMap<Server_Card *, CardToMove *> cardProperties;
for (int i = 0; i < _cards.size(); ++i) {
int position;
Server_Card *card = startzone->getCard(_cards[i]->getCardId(), false, &position);
Server_Card *card = startzone->getCard(_cards[i]->getCardId(), &position);
if (!card)
return RespNameNotFound;
if (!card->getAttachedCards().isEmpty() && !targetzone->isColumnEmpty(x, y))
@ -510,7 +510,7 @@ ResponseCode Server_Player::setCardAttrHelper(CommandContainer *cont, const QStr
return RespInvalidCommand;
}
} else {
Server_Card *card = zone->getCard(cardId, false);
Server_Card *card = zone->getCard(cardId);
if (!card)
return RespNameNotFound;
result = card->setAttribute(attrName, attrValue, false);