jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-18 08:22:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

use constants instead of static methods

Browse source
This commit is contained in:
RickyRister 2025-04-20 21:04:01 -07:00
parent ca73033aea
commit 6c21712e45
2 changed files with 24 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,47 +12,13 @@
#include <utility> #include <utility>
const QString &MessageLogWidget::tableConstant() const static const QString TABLE_ZONE_NAME = "table";
{ static const QString GRAVE_ZONE_NAME = "grave";
static const QString constant("table"); static const QString EXILE_ZONE_NAME = "rfg";
return constant; static const QString HAND_ZONE_NAME = "hand";
} static const QString DECK_ZONE_NAME = "deck";
static const QString SIDEBOARD_ZONE_NAME = "sb";
const QString &MessageLogWidget::graveyardConstant() const static const QString STACK_ZONE_NAME = "stack";
{
static const QString constant("grave");
return constant;
}
const QString &MessageLogWidget::exileConstant() const
{
static const QString constant("rfg");
return constant;
}
const QString &MessageLogWidget::handConstant() const
{
static const QString constant("hand");
return constant;
}
const QString &MessageLogWidget::deckConstant() const
{
static const QString constant("deck");
return constant;
}
const QString &MessageLogWidget::sideboardConstant() const
{
static const QString constant("sb");
return constant;
}
const QString &MessageLogWidget::stackConstant() const
{
static const QString constant("stack");
return constant;
}
QString MessageLogWidget::sanitizeHtml(QString dirty) const QString MessageLogWidget::sanitizeHtml(QString dirty) const
{ {
@ -71,15 +37,15 @@ MessageLogWidget::getFromStr(CardZone *zone, QString cardName, int position, boo
QString fromStr; QString fromStr;
QString zoneName = zone->getName(); QString zoneName = zone->getName();
if (zoneName == tableConstant()) { if (zoneName == TABLE_ZONE_NAME) {
fromStr = tr(" from play"); fromStr = tr(" from play");
} else if (zoneName == graveyardConstant()) { } else if (zoneName == GRAVE_ZONE_NAME) {
fromStr = tr(" from their graveyard"); fromStr = tr(" from their graveyard");
} else if (zoneName == exileConstant()) { } else if (zoneName == EXILE_ZONE_NAME) {
fromStr = tr(" from exile"); fromStr = tr(" from exile");
} else if (zoneName == handConstant()) { } else if (zoneName == HAND_ZONE_NAME) {
fromStr = tr(" from their hand"); fromStr = tr(" from their hand");
} else if (zoneName == deckConstant()) { } else if (zoneName == DECK_ZONE_NAME) {
if (position == 0) { if (position == 0) {
if (cardName.isEmpty()) { if (cardName.isEmpty()) {
if (ownerChange) { if (ownerChange) {
@ -117,9 +83,9 @@ MessageLogWidget::getFromStr(CardZone *zone, QString cardName, int position, boo
fromStr = tr(" from their library"); fromStr = tr(" from their library");
} }
} }
} else if (zoneName == sideboardConstant()) { } else if (zoneName == SIDEBOARD_ZONE_NAME) {
fromStr = tr(" from sideboard"); fromStr = tr(" from sideboard");
} else if (zoneName == stackConstant()) { } else if (zoneName == STACK_ZONE_NAME) {
fromStr = tr(" from the stack"); fromStr = tr(" from the stack");
} }
@ -291,9 +257,9 @@ void MessageLogWidget::logMoveCard(Player *player,
bool ownerChanged = startZone->getPlayer() != targetZone->getPlayer(); bool ownerChanged = startZone->getPlayer() != targetZone->getPlayer();
// do not log if moved within the same zone // do not log if moved within the same zone
if ((startZoneName == tableConstant() && targetZoneName == tableConstant() && !ownerChanged) || if ((startZoneName == TABLE_ZONE_NAME && targetZoneName == TABLE_ZONE_NAME && !ownerChanged) ||
(startZoneName == handConstant() && targetZoneName == handConstant()) || (startZoneName == HAND_ZONE_NAME && targetZoneName == HAND_ZONE_NAME) ||
(startZoneName == exileConstant() && targetZoneName == exileConstant())) { (startZoneName == EXILE_ZONE_NAME && targetZoneName == EXILE_ZONE_NAME)) {
return; return;
} }
@ -322,20 +288,20 @@ void MessageLogWidget::logMoveCard(Player *player,
QString finalStr; QString finalStr;
bool usesNewX = false; bool usesNewX = false;
if (targetZoneName == tableConstant()) { if (targetZoneName == TABLE_ZONE_NAME) {
soundEngine->playSound("play_card"); soundEngine->playSound("play_card");
if (card->getFaceDown()) { if (card->getFaceDown()) {
finalStr = tr("%1 puts %2 into play%3 face down."); finalStr = tr("%1 puts %2 into play%3 face down.");
} else { } else {
finalStr = tr("%1 puts %2 into play%3."); finalStr = tr("%1 puts %2 into play%3.");
} }
} else if (targetZoneName == graveyardConstant()) { } else if (targetZoneName == GRAVE_ZONE_NAME) {
finalStr = tr("%1 puts %2%3 into their graveyard."); finalStr = tr("%1 puts %2%3 into their graveyard.");
} else if (targetZoneName == exileConstant()) { } else if (targetZoneName == EXILE_ZONE_NAME) {
finalStr = tr("%1 exiles %2%3."); finalStr = tr("%1 exiles %2%3.");
} else if (targetZoneName == handConstant()) { } else if (targetZoneName == HAND_ZONE_NAME) {
finalStr = tr("%1 moves %2%3 to their hand."); finalStr = tr("%1 moves %2%3 to their hand.");
} else if (targetZoneName == deckConstant()) { } else if (targetZoneName == DECK_ZONE_NAME) {
if (newX == -1) { if (newX == -1) {
finalStr = tr("%1 puts %2%3 into their library."); finalStr = tr("%1 puts %2%3 into their library.");
} else if (newX >= targetZone->getCards().size()) { } else if (newX >= targetZone->getCards().size()) {
@ -347,9 +313,9 @@ void MessageLogWidget::logMoveCard(Player *player,
usesNewX = true; 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 (targetZoneName == sideboardConstant()) { } else if (targetZoneName == SIDEBOARD_ZONE_NAME) {
finalStr = tr("%1 moves %2%3 to sideboard."); finalStr = tr("%1 moves %2%3 to sideboard.");
} else if (targetZoneName == stackConstant()) { } else if (targetZoneName == STACK_ZONE_NAME) {
soundEngine->playSound("play_card"); soundEngine->playSound("play_card");
finalStr = tr("%1 plays %2%3."); finalStr = tr("%1 plays %2%3.");
} }

8
cockatrice/src/server/message_log_widget.h
View file

@ -26,14 +26,6 @@ private:
MessageContext currentContext; MessageContext currentContext;
QString messagePrefix, messageSuffix; QString messagePrefix, messageSuffix;
const QString &tableConstant() const;
const QString &graveyardConstant() const;
const QString &exileConstant() const;
const QString &handConstant() const;
const QString &deckConstant() const;
const QString &sideboardConstant() const;
const QString &stackConstant() const;
QString sanitizeHtml(QString dirty) const; QString sanitizeHtml(QString dirty) const;
QString cardLink(QString cardName) const; QString cardLink(QString cardName) const;
QPair<QString, QString> getFromStr(CardZone *zone, QString cardName, int position, bool ownerChange) const; QPair<QString, QString> getFromStr(CardZone *zone, QString cardName, int position, bool ownerChange) const;