diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-07-25 02:30:47 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-07-25 02:30:47 +0300 |
commit | c9795055ee1b6079ef9b0c0e3faf4bb79704bd98 (patch) | |
tree | 147357b76a80705cf0af7bc1ec69cf417ef94812 /src/gui/windows/ministatuswindow.cpp | |
parent | 1e5a50f6c67cd20967e139320a6c00f54e15dfe2 (diff) | |
download | manaplus-c9795055ee1b6079ef9b0c0e3faf4bb79704bd98.tar.gz manaplus-c9795055ee1b6079ef9b0c0e3faf4bb79704bd98.tar.bz2 manaplus-c9795055ee1b6079ef9b0c0e3faf4bb79704bd98.tar.xz manaplus-c9795055ee1b6079ef9b0c0e3faf4bb79704bd98.zip |
Add into player attributes prefix PLAYER_.
Diffstat (limited to 'src/gui/windows/ministatuswindow.cpp')
-rw-r--r-- | src/gui/windows/ministatuswindow.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 6bf43d216..b2d89adef 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -274,16 +274,16 @@ void MiniStatusWindow::attributeChanged(const AttributesT id, PRAGMA45(GCC diagnostic ignored "-Wswitch-enum") switch (id) { - case Attributes::HP: - case Attributes::MAX_HP: + case Attributes::PLAYER_HP: + case Attributes::PLAYER_MAX_HP: StatusWindow::updateHPBar(mHpBar); break; - case Attributes::MP: - case Attributes::MAX_MP: + case Attributes::PLAYER_MP: + case Attributes::PLAYER_MAX_MP: statusWindow->updateMPBar(mMpBar); break; - case Attributes::EXP: - case Attributes::EXP_NEEDED: + case Attributes::PLAYER_EXP: + case Attributes::PLAYER_EXP_NEEDED: StatusWindow::updateXPBar(mXpBar); break; case Attributes::TOTAL_WEIGHT: @@ -354,18 +354,18 @@ void MiniStatusWindow::mouseMoved(MouseEvent &event) { // TRANSLATORS: status bar label level = strprintf(_("Level: %d (GM %d)"), - PlayerInfo::getAttribute(Attributes::LEVEL), + PlayerInfo::getAttribute(Attributes::PLAYER_LEVEL), localPlayer->getGMLevel()); } else { // TRANSLATORS: status bar label level = strprintf(_("Level: %d"), - PlayerInfo::getAttribute(Attributes::LEVEL)); + PlayerInfo::getAttribute(Attributes::PLAYER_LEVEL)); } - const int exp = PlayerInfo::getAttribute(Attributes::EXP); - const int expNeed = PlayerInfo::getAttribute(Attributes::EXP_NEEDED); + const int exp = PlayerInfo::getAttribute(Attributes::PLAYER_EXP); + const int expNeed = PlayerInfo::getAttribute(Attributes::PLAYER_EXP_NEEDED); if (exp > expNeed) { textPopup->show(x + rect.x, y + rect.y, level, strprintf("%d/%d", @@ -383,25 +383,25 @@ void MiniStatusWindow::mouseMoved(MouseEvent &event) else if (event.getSource() == mHpBar) { textPopup->show(x + rect.x, y + rect.y, event.getSource()->getId(), - strprintf("%d/%d", PlayerInfo::getAttribute(Attributes::HP), - PlayerInfo::getAttribute(Attributes::MAX_HP))); + strprintf("%d/%d", PlayerInfo::getAttribute(Attributes::PLAYER_HP), + PlayerInfo::getAttribute(Attributes::PLAYER_MAX_HP))); mStatusPopup->hide(); } else if (event.getSource() == mMpBar) { textPopup->show(x + rect.x, y + rect.y, event.getSource()->getId(), - strprintf("%d/%d", PlayerInfo::getAttribute(Attributes::MP), - PlayerInfo::getAttribute(Attributes::MAX_MP))); + strprintf("%d/%d", PlayerInfo::getAttribute(Attributes::PLAYER_MP), + PlayerInfo::getAttribute(Attributes::PLAYER_MAX_MP))); mStatusPopup->hide(); } else if (event.getSource() == mJobBar) { const std::pair<int, int> exp = PlayerInfo::getStatExperience( - Attributes::JOB); + Attributes::PLAYER_JOB); // TRANSLATORS: job bar label const std::string level = strprintf(_("Job level: %d"), - PlayerInfo::getStatBase(Attributes::JOB)); + PlayerInfo::getStatBase(Attributes::PLAYER_JOB)); if (exp.first > exp.second) { |