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

Merge pull request #520 from mcallahan/always-reveal-top-master-master

Browse source 
Reset Always reveal top card when starting a new game.
This commit is contained in:
Gavin Bisesi 2015-01-05 16:36:07 -05:00
commit c98a146746
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cockatrice/src/player.cpp
View file

@ -2225,6 +2225,13 @@ qreal Player::getMinimumWidth() const
return result; return result;
} }
void Player::setGameStarted()
{
if (local)
aAlwaysRevealTopCard->setChecked(false);
setConceded(false);
}
void Player::setConceded(bool _conceded) void Player::setConceded(bool _conceded)
{ {
conceded = _conceded; conceded = _conceded;

2
cockatrice/src/player.h
View file

@ -286,6 +286,8 @@ public:
void setConceded(bool _conceded); void setConceded(bool _conceded);
bool getConceded() const { return conceded; } bool getConceded() const { return conceded; }
void setGameStarted();
qreal getMinimumWidth() const; qreal getMinimumWidth() const;
void setMirrored(bool _mirrored); void setMirrored(bool _mirrored);

2
cockatrice/src/tab_game.cpp
View file

@ -872,7 +872,7 @@ void TabGame::startGame(bool resuming)
if (!resuming) { if (!resuming) {
QMapIterator<int, Player *> playerIterator(players); QMapIterator<int, Player *> playerIterator(players);
while (playerIterator.hasNext()) while (playerIterator.hasNext())
playerIterator.next().value()->setConceded(false); playerIterator.next().value()->setGameStarted();
} }
playerListWidget->setGameStarted(true, resuming); playerListWidget->setGameStarted(true, resuming);