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

initial way of getting rid of warning (#2817)

Browse source
This commit is contained in:
John Hill 2017-08-06 18:04:03 -07:00 committed by Zach H
parent af3423e67d
commit dd05b86bc9
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cockatrice/src/messagelogwidget.cpp
View file

@ -317,6 +317,7 @@ void MessageLogWidget::logDoMoveCard(LogMoveCard &lmc)
} }
QString finalStr; QString finalStr;
bool usesNewX = false;
if (targetZone == tableConstant()) { if (targetZone == tableConstant()) {
soundEngine->playSound("play_card"); soundEngine->playSound("play_card");
if (moveCardTapped.value(lmc.card)) if (moveCardTapped.value(lmc.card))
@ -338,6 +339,7 @@ void MessageLogWidget::logDoMoveCard(LogMoveCard &lmc)
finalStr = tr("%1 puts %2%3 on top of their library."); finalStr = tr("%1 puts %2%3 on top of their library.");
else { else {
lmc.newX++; lmc.newX++;
usesNewX = true;
finalStr = tr("%1 puts %2%3 into their library %4 cards from the top."); finalStr = tr("%1 puts %2%3 into their library %4 cards from the top.");
} }
} else if (targetZone == sideboardConstant()) } else if (targetZone == sideboardConstant())
@ -347,11 +349,19 @@ void MessageLogWidget::logDoMoveCard(LogMoveCard &lmc)
finalStr = tr("%1 plays %2%3."); finalStr = tr("%1 plays %2%3.");
} }
appendHtmlServerMessage( if (usesNewX) {
appendHtmlServerMessage(
finalStr.arg(sanitizeHtml(lmc.player->getName()))
.arg(cardStr)
.arg(nameFrom.second)
.arg(lmc.newX));
} else {
appendHtmlServerMessage(
finalStr.arg(sanitizeHtml(lmc.player->getName())) finalStr.arg(sanitizeHtml(lmc.player->getName()))
.arg(cardStr) .arg(cardStr)
.arg(nameFrom.second) .arg(nameFrom.second));
.arg(lmc.newX)); }
} }
void MessageLogWidget::logDrawCards(Player *player, int number) void MessageLogWidget::logDrawCards(Player *player, int number)