From 64d30eda264c342aced8d791b47a35def0e4d15c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 27 Sep 2017 20:27:11 +0300 Subject: Rename Attributes::PLAYER_LEVEL to Attributes::PLAYER_BASE_LEVEL. --- src/gui/widgets/characterdisplay.cpp | 2 +- src/gui/windows/charselectdialog.cpp | 2 +- src/gui/windows/chatwindow.cpp | 2 +- src/gui/windows/killstats.cpp | 2 +- src/gui/windows/ministatuswindow.cpp | 4 ++-- src/gui/windows/statuswindow.cpp | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/gui') diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp index c3b5ea064..efc256516 100644 --- a/src/gui/widgets/characterdisplay.cpp +++ b/src/gui/widgets/characterdisplay.cpp @@ -141,7 +141,7 @@ void CharacterDisplay::mouseMoved(MouseEvent &event A_UNUSED) // TRANSLATORS: character level strprintf(_("Level: %u"), CAST_U32( - mCharacter->data.mAttributes[Attributes::PLAYER_LEVEL])), + mCharacter->data.mAttributes[Attributes::PLAYER_BASE_LEVEL])), // TRANSLATORS: character money strprintf(_("Money: %s"), UnitsDb::formatCurrency( mCharacter->data.mAttributes[Attributes::MONEY]).c_str())); diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index d7ba2ea83..aa4a80b4a 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -257,7 +257,7 @@ void CharSelectDialog::action(const ActionEvent &event) CAST_U32( character->data.mAttributes[Attributes::PLAYER_MAX_MP]), CAST_U32( - character->data.mAttributes[Attributes::PLAYER_LEVEL]), + character->data.mAttributes[Attributes::PLAYER_BASE_LEVEL]), strExp.c_str(), UnitsDb::formatCurrency( character->data.mAttributes[Attributes::MONEY]).c_str()); diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 091548381..a3bb4829b 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -1045,7 +1045,7 @@ void ChatWindow::attributeChanged(const AttributesT id, } break; } - case Attributes::PLAYER_LEVEL: + case Attributes::PLAYER_BASE_LEVEL: battleChatLog(std::string( "Level: ").append(toString(CAST_S32( newVal))), diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp index 002bfcaf3..a110f21f1 100644 --- a/src/gui/windows/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -439,7 +439,7 @@ void KillStats::attributeChanged(const AttributesT id, case Attributes::PLAYER_EXP_NEEDED: gainXp(newVal - oldVal); break; - case Attributes::PLAYER_LEVEL: + case Attributes::PLAYER_BASE_LEVEL: { const std::string strXpPercent = toString(CAST_U64( PlayerInfo::getAttribute( diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 64d1a1175..fcaff8759 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -356,14 +356,14 @@ void MiniStatusWindow::mouseMoved(MouseEvent &event) { // TRANSLATORS: status bar label level = strprintf(_("Level: %d (GM %d)"), - PlayerInfo::getAttribute(Attributes::PLAYER_LEVEL), + PlayerInfo::getAttribute(Attributes::PLAYER_BASE_LEVEL), localPlayer->getGroupId()); } else { // TRANSLATORS: status bar label level = strprintf(_("Level: %d"), - PlayerInfo::getAttribute(Attributes::PLAYER_LEVEL)); + PlayerInfo::getAttribute(Attributes::PLAYER_BASE_LEVEL)); } const int64_t exp = PlayerInfo::getAttribute64(Attributes::PLAYER_EXP); diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 62da4e71d..462f22021 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -271,7 +271,7 @@ void StatusWindow::updateLevelLabel() { // TRANSLATORS: status window label mLvlLabel->setCaption(strprintf(_("Level: %d (%s %d)"), - PlayerInfo::getAttribute(Attributes::PLAYER_LEVEL), + PlayerInfo::getAttribute(Attributes::PLAYER_BASE_LEVEL), name.c_str(), groupId)); } @@ -279,7 +279,7 @@ void StatusWindow::updateLevelLabel() { // TRANSLATORS: status window label mLvlLabel->setCaption(strprintf(_("Level: %d"), - PlayerInfo::getAttribute(Attributes::PLAYER_LEVEL))); + PlayerInfo::getAttribute(Attributes::PLAYER_BASE_LEVEL))); } mLvlLabel->adjustSize(); } @@ -371,7 +371,7 @@ void StatusWindow::attributeChanged(const AttributesT id, mMoneyLabel->adjustSize(); break; - case Attributes::PLAYER_LEVEL: + case Attributes::PLAYER_BASE_LEVEL: // TRANSLATORS: status window label mLvlLabel->setCaption(strprintf(_("Level: %d"), CAST_S32(newVal))); -- cgit v1.2.3-70-g09d2