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

Fix QString missing arg warning in logMoveCard (#5992)

Browse source
This commit is contained in:
RickyRister 2025-06-14 08:11:00 -07:00 • committed by GitHub
parent 61a6b32137
commit d42bfa88e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cockatrice/src/server/message_log_widget.cpp
View file

@ -293,7 +293,7 @@ void MessageLogWidget::logMoveCard(Player *player,
} }
QString finalStr; QString finalStr;
bool usesNewX = false; std::optional<QString> fourthArg;
if (targetZoneName == TABLE_ZONE_NAME) { if (targetZoneName == TABLE_ZONE_NAME) {
soundEngine->playSound("play_card"); soundEngine->playSound("play_card");
if (card->getFaceDown()) { if (card->getFaceDown()) {
@ -316,7 +316,7 @@ void MessageLogWidget::logMoveCard(Player *player,
finalStr = tr("%1 puts %2%3 on top of their library."); finalStr = tr("%1 puts %2%3 on top of their library.");
} else { } else {
++newX; ++newX;
usesNewX = true; fourthArg = QString::number(newX);
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 (targetZoneName == SIDEBOARD_ZONE_NAME) { } else if (targetZoneName == SIDEBOARD_ZONE_NAME) {
@ -325,16 +325,17 @@ void MessageLogWidget::logMoveCard(Player *player,
soundEngine->playSound("play_card"); soundEngine->playSound("play_card");
finalStr = tr("%1 plays %2%3."); finalStr = tr("%1 plays %2%3.");
} else { } else {
fourthArg = targetZoneName;
finalStr = tr("%1 moves %2%3 to custom zone '%4'."); finalStr = tr("%1 moves %2%3 to custom zone '%4'.");
} }
if (usesNewX) { QString message = finalStr.arg(sanitizeHtml(player->getName()), cardStr, nameFrom.second);
appendHtmlServerMessage(
finalStr.arg(sanitizeHtml(player->getName())).arg(cardStr).arg(nameFrom.second).arg(newX)); if (fourthArg.has_value()) {
} else { message = message.arg(fourthArg.value());
appendHtmlServerMessage(
finalStr.arg(sanitizeHtml(player->getName())).arg(cardStr).arg(nameFrom.second).arg(targetZoneName));
} }
appendHtmlServerMessage(message);
} }
void MessageLogWidget::logDrawCards(Player *player, int number, bool deckIsEmpty) void MessageLogWidget::logDrawCards(Player *player, int number, bool deckIsEmpty)