jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 00:24:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cleanup

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-03-09 14:43:06 +01:00
parent 15aa6a600a
commit 929f4f9b4d
10 changed files with 14 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cockatrice/src/cardzone.cpp
View file

@ -82,18 +82,14 @@ void CardZone::mousePressEvent(QGraphicsSceneMouseEvent *event)
void CardZone::addCard(CardItem *card, bool reorganize, int x, int y)
{
dumpObjectInfo();
if (view)
if ((x <= view->getCards().size()) || (view->getNumberCards() == -1))
view->addCard(new CardItem(player, card->getName(), card->getId()), reorganize, x, y);
addCardImpl(card, x, y);
if (reorganize) {
qDebug("------------ emitting");
emit contentsChanged();
if (reorganize)
reorganizeCards();
}
}
CardItem *CardZone::getCard(int cardId, const QString &cardName)
@ -137,7 +133,6 @@ CardItem *CardZone::takeCard(int position, int cardId, const QString &cardName,
c->setId(cardId);
c->setName(cardName);
emit contentsChanged();
reorganizeCards();
return c;
}