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

Unconcede (#3515)

Browse source
This commit is contained in:
Rob Blanckaert 2019-01-27 09:50:41 -08:00 • committed by Zach H
parent 0dcf97d29d
commit 7cd9b9c0c8
13 changed files with 82 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/gamescene.cpp
View file

@ -40,7 +40,7 @@ void GameScene::addPlayer(Player *player)
players << player;
addItem(player);
connect(player, SIGNAL(sizeChanged()), this, SLOT(rearrange()));
connect(player, SIGNAL(gameConceded()), this, SLOT(rearrange()));
connect(player, SIGNAL(playerCountChanged()), this, SLOT(rearrange()));
}
void GameScene::removePlayer(Player *player)

6
cockatrice/src/messagelogwidget.cpp
View file

@ -169,6 +169,12 @@ void MessageLogWidget::logConcede(Player *player)
appendHtmlServerMessage(tr("%1 has conceded the game.").arg(sanitizeHtml(player->getName())), true);
}
void MessageLogWidget::logUnconcede(Player *player)
{
soundEngine->playSound("player_concede");
appendHtmlServerMessage(tr("%1 has unconceded the game.").arg(sanitizeHtml(player->getName())), true);
}
void MessageLogWidget::logConnectionStateChanged(Player *player, bool connectionState)
{
if (connectionState) {

1
cockatrice/src/messagelogwidget.h
View file

@ -57,6 +57,7 @@ public slots:
void logAlwaysRevealTopCard(Player *player, CardZone *zone, bool reveal);
void logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName);
void logConcede(Player *player);
void logUnconcede(Player *player);
void logConnectionStateChanged(Player *player, bool connectionState);
void logCreateArrow(Player *player,
Player *startPlayer,

2
cockatrice/src/player.cpp
View file

@ -3037,8 +3037,8 @@ void Player::setConceded(bool _conceded)
setVisible(!conceded);
if (conceded) {
clear();
emit gameConceded();
}
emit playerCountChanged();
}
void Player::setMirrored(bool _mirrored)

2
cockatrice/src/player.h
View file

@ -137,7 +137,7 @@ signals:
void logAlwaysRevealTopCard(Player *player, CardZone *zone, bool reveal);
void sizeChanged();
void gameConceded();
void playerCountChanged();
public slots:
void actUntapAll();
void actRollDie();

28
cockatrice/src/tab_game.cpp
View file

@ -620,11 +620,23 @@ void TabGame::actGameInfo()
void TabGame::actConcede()
{
if (QMessageBox::question(this, tr("Concede"), tr("Are you sure you want to concede this game?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
Player *player = players.value(localPlayerId, nullptr);
if (player == nullptr)
return;
if (!player->getConceded()) {
if (QMessageBox::question(this, tr("Concede"), tr("Are you sure you want to concede this game?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
return;
sendGameCommand(Command_Concede());
sendGameCommand(Command_Concede());
} else {
if (QMessageBox::question(this, tr("Unconcede"),
tr("You have already conceded. Do you want to return to this game?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
return;
sendGameCommand(Command_Unconcede());
}
}
void TabGame::actLeaveGame()
@ -1051,6 +1063,16 @@ void TabGame::eventPlayerPropertiesChanged(const Event_PlayerPropertiesChanged &
break;
}
case GameEventContext::UNCONCEDE: {
messageLog->logUnconcede(player);
player->setConceded(false);
QMapIterator<int, Player *> playerIterator(players);
while (playerIterator.hasNext())
playerIterator.next().value()->updateZones();
break;
}
case GameEventContext::DECK_SELECT: {
Context_DeckSelect deckSelect = context.GetExtension(Context_DeckSelect::ext);
messageLog->logDeckSelect(player, QString::fromStdString(deckSelect.deck_hash()),