summaryrefslogtreecommitdiff
path: root/src/gui/windows/inventorywindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-01-31 18:57:07 +0300
committerAndrei Karas <akaras@inbox.ru>2017-01-31 18:57:07 +0300
commit5719a23f9b0729f04ed1fa5dc6cc680c58d514d4 (patch)
treed4fc1a73ea263a737e56d740a266bea34a1bbfcd /src/gui/windows/inventorywindow.cpp
parent31e7a7d05f36495df0176fc31d5894e216c3cdf4 (diff)
downloadmv-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.tar.gz
mv-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.tar.bz2
mv-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.tar.xz
mv-5719a23f9b0729f04ed1fa5dc6cc680c58d514d4.zip
Move units into db directory.
Diffstat (limited to 'src/gui/windows/inventorywindow.cpp')
-rw-r--r--src/gui/windows/inventorywindow.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 440d8ab6d..7e303af28 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -23,7 +23,6 @@
#include "gui/windows/inventorywindow.h"
#include "configuration.h"
-#include "units.h"
#include "being/playerinfo.h"
@@ -65,6 +64,8 @@
#include "resources/iteminfo.h"
+#include "resources/db/unitsdb.h"
+
#include "resources/item/item.h"
#include "utils/delete2.h"
@@ -701,7 +702,7 @@ void InventoryWindow::mouseMoved(MouseEvent &event)
{
// TRANSLATORS: money label
textPopup->show(rect.x + x, rect.y + y, strprintf(_("Money: %s"),
- Units::formatCurrency(PlayerInfo::getAttribute(
+ UnitsDb::formatCurrency(PlayerInfo::getAttribute(
Attributes::MONEY)).c_str()));
}
else
@@ -856,8 +857,8 @@ void InventoryWindow::updateWeight()
mWeightBar->setProgress(static_cast<float>(total)
/ static_cast<float>(max));
mWeightBar->setText(strprintf("%s/%s",
- Units::formatWeight(total).c_str(),
- Units::formatWeight(max).c_str()));
+ UnitsDb::formatWeight(total).c_str(),
+ UnitsDb::formatWeight(max).c_str()));
}
void InventoryWindow::slotsChanged(const Inventory *const inventory)