aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #595 from poixen/shufflefix

Browse source 
Fixed shuffle issue
This commit is contained in:
Zach 2015-01-26 10:24:55 -05:00
commit 613f7717ab
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/zoneviewwidget.cpp
View file

@ -57,7 +57,7 @@ void TitleLabel::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
} }
ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberCards, bool _revealZone, bool _writeableRevealZone, const QList<const ServerInfo_Card *> &cardList) ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberCards, bool _revealZone, bool _writeableRevealZone, const QList<const ServerInfo_Card *> &cardList)
: QGraphicsWidget(0, Qt::Tool | Qt::FramelessWindowHint), player(_player) : QGraphicsWidget(0, Qt::Tool | Qt::FramelessWindowHint), player(_player), canBeShuffled(_origZone->getIsShufflable())
{ {
setAcceptHoverEvents(true); setAcceptHoverEvents(true);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
@ -227,7 +227,8 @@ void ZoneViewWidget::closeEvent(QCloseEvent *event)
} }
if (shuffleCheckBox.isChecked()) if (shuffleCheckBox.isChecked())
player->sendGameCommand(Command_Shuffle()); player->sendGameCommand(Command_Shuffle());
settingsCache->setZoneViewShuffle(shuffleCheckBox.isChecked()); if (canBeShuffled)
settingsCache->setZoneViewShuffle(shuffleCheckBox.isChecked());
emit closePressed(this); emit closePressed(this);
deleteLater(); deleteLater();
event->accept(); event->accept();

1
cockatrice/src/zoneviewwidget.h
View file

@ -48,6 +48,7 @@ private:
QCheckBox shuffleCheckBox; QCheckBox shuffleCheckBox;
QCheckBox pileViewCheckBox; QCheckBox pileViewCheckBox;
bool canBeShuffled;
int extraHeight; int extraHeight;
Player *player; Player *player;
signals: signals: