diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-01-31 18:57:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-01-31 18:57:07 +0300 |
| commit | 5719a23f9b0729f04ed1fa5dc6cc680c58d514d4 (patch) | |
| tree | d4fc1a73ea263a737e56d740a266bea34a1bbfcd /src/gui/windows/statuswindow.cpp | |
| parent | 31e7a7d05f36495df0176fc31d5894e216c3cdf4 (diff) | |
| download | manaplus-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.tar.gz manaplus-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.tar.bz2 manaplus-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.tar.xz manaplus-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.zip | |
Move units into db directory.
Diffstat (limited to 'src/gui/windows/statuswindow.cpp')
| -rw-r--r-- | src/gui/windows/statuswindow.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 933e80dee..9b1fa0770 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -25,7 +25,6 @@ #include "configuration.h" #include "gamemodifiers.h" #include "settings.h" -#include "units.h" #include "being/localplayer.h" #include "being/playerinfo.h" @@ -49,6 +48,7 @@ #include "net/inventoryhandler.h" #include "net/playerhandler.h" +#include "resources/db/unitsdb.h" #include "resources/db/statdb.h" #include "resources/item/item.h" @@ -215,8 +215,9 @@ StatusWindow::StatusWindow() : updateXPBar(mXpBar, false); // TRANSLATORS: status window label - mMoneyLabel->setCaption(strprintf(_("Money: %s"), Units::formatCurrency( - PlayerInfo::getAttribute(Attributes::MONEY)).c_str())); + mMoneyLabel->setCaption(strprintf(_("Money: %s"), + UnitsDb::formatCurrency(PlayerInfo::getAttribute( + Attributes::MONEY)).c_str())); mMoneyLabel->adjustSize(); updateLevelLabel(); @@ -356,7 +357,7 @@ void StatusWindow::attributeChanged(const AttributesT id, case Attributes::MONEY: // TRANSLATORS: status window label mMoneyLabel->setCaption(strprintf(_("Money: %s"), - Units::formatCurrency(newVal).c_str())); + UnitsDb::formatCurrency(newVal).c_str())); mMoneyLabel->adjustSize(); break; @@ -510,8 +511,9 @@ void StatusWindow::updateWeightBar(ProgressBar *const bar) progress = static_cast<float>(totalWeight) / static_cast<float>(maxWeight); } - bar->setText(strprintf("%s/%s", Units::formatWeight( - totalWeight).c_str(), Units::formatWeight(maxWeight).c_str())); + bar->setText(strprintf("%s/%s", + UnitsDb::formatWeight(totalWeight).c_str(), + UnitsDb::formatWeight(maxWeight).c_str())); bar->setProgress(progress); } } @@ -522,7 +524,7 @@ void StatusWindow::updateMoneyBar(ProgressBar *const bar) return; const int money = PlayerInfo::getAttribute(Attributes::MONEY); - bar->setText(Units::formatCurrency(money)); + bar->setText(UnitsDb::formatCurrency(money)); if (money > 0) { const float progress = static_cast<float>(money) |