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

minor cleanups

Browse source
This commit is contained in:
brukie 2009-05-22 22:32:05 +02:00
parent 0ef00dd437
commit 7e13352a95
29 changed files with 102 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

38
cockatrice/src/cardzone.cpp
View file

@ -6,7 +6,7 @@
#include "zoneviewzone.h"
CardZone::CardZone(Player *_p, const QString &_name, bool _hasCardAttr, bool _isShufflable, QGraphicsItem *parent, bool isView)
: QGraphicsItem(parent), player(_p), name(_name), cards(NULL), menu(NULL), hasCardAttr(_hasCardAttr), isShufflable(_isShufflable)
: QGraphicsItem(parent), player(_p), name(_name), cards(NULL), view(NULL), menu(NULL), hasCardAttr(_hasCardAttr), isShufflable(_isShufflable)
{
if (!isView)
player->addZone(this);
@ -15,9 +15,7 @@ CardZone::CardZone(Player *_p, const QString &_name, bool _hasCardAttr, bool _is
CardZone::~CardZone()
{
qDebug(QString("CardZone destructor: %1").arg(name).toLatin1());
while (!views.empty())
delete views.at(0);
delete view;
clearContents();
delete cards;
}
@ -41,6 +39,17 @@ void CardZone::mousePressEvent(QGraphicsSceneMouseEvent *event)
event->ignore();
}
void CardZone::addCard(CardItem *card, bool reorganize, int x, int y)
{
if (view)
view->addCard(new CardItem(player->getDb(), card->getName(), card->getId()), reorganize, x, y);
addCardImpl(card, x, y);
if (reorganize)
reorganizeCards();
}
CardItem *CardZone::getCard(int cardId, const QString &cardName)
{
CardItem *c = cards->findCard(cardId, false);
@ -60,13 +69,13 @@ CardItem *CardZone::takeCard(int position, int cardId, const QString &cardName)
return NULL;
CardItem *c = cards->takeAt(position);
for (int i = 0; i < views.size(); i++)
views[i]->removeCard(position);
if (view)
view->removeCard(position);
c->setId(cardId);
c->setName(cardName);
// if (c->getId() == -1) {
c->setId(cardId);
c->setName(cardName);
// }
reorganizeCards();
return c;
}
@ -82,14 +91,9 @@ void CardZone::hoverCardEvent(CardItem *card)
player->hoverCardEvent(card);
}
void CardZone::addView(ZoneViewZone *view)
void CardZone::setView(ZoneViewZone *_view)
{
views.append(view);
}
void CardZone::removeView(ZoneViewZone *view)
{
views.removeAt(views.indexOf(view));
view = _view;
}
void CardZone::moveAllToZone(const QString &targetZone, int targetX)