Move units into db directory.

3 files changed, 11 insertions, 8 deletions

diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 35baf812d..81f072da4 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -22,7 +22,6 @@
 
 #include "net/eathena/playerhandler.h"
 
-#include "units.h"
 #include "notifymanager.h"
 #include "party.h"
 
@@ -41,6 +40,8 @@
 #include "net/eathena/inventoryhandler.h"
 #include "net/eathena/sp.h"
 
+#include "resources/db/unitsdb.h"
+
 #include "debug.h"
 
 extern Net::PlayerHandler *playerHandler;
@@ -617,12 +618,12 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
             if (newMoney > oldMoney)
             {
                 NotifyManager::notify(NotifyTypes::MONEY_GET,
-                    Units::formatCurrency(newMoney - oldMoney));
+                    UnitsDb::formatCurrency(newMoney - oldMoney));
             }
             else if (newMoney < oldMoney)
             {
                 NotifyManager::notify(NotifyTypes::MONEY_SPENT,
-                    Units::formatCurrency(oldMoney - newMoney).c_str());
+                    UnitsDb::formatCurrency(oldMoney - newMoney).c_str());
             }
 
             PlayerInfo::setAttribute(Attributes::MONEY, newMoney);
diff --git a/src/net/eathena/vendingrecv.cpp b/src/net/eathena/vendingrecv.cpp
index 4431acac2..f5168abac 100644
--- a/src/net/eathena/vendingrecv.cpp
+++ b/src/net/eathena/vendingrecv.cpp
@@ -23,7 +23,6 @@
 #include "actormanager.h"
 #include "itemcolormanager.h"
 #include "notifymanager.h"
-#include "units.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -43,6 +42,8 @@
 
 #include "resources/iteminfo.h"
 
+#include "resources/db/unitsdb.h"
+
 #include "resources/inventory/inventory.h"
 
 #include "resources/item/shopitem.h"
@@ -243,7 +244,7 @@ void VendingRecv::processReport(Net::MessageIn &msg)
         str = strprintf(_("Sold item %s amount %d. You got: %s"),
             info.getLink().c_str(),
             amount,
-            Units::formatCurrency(money).c_str());
+            UnitsDb::formatCurrency(money).c_str());
     }
     else
     {
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 43ebaa483..d9ec46fe3 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -22,7 +22,6 @@
 
 #include "net/tmwa/playerhandler.h"
 
-#include "units.h"
 #include "notifymanager.h"
 #include "party.h"
 
@@ -41,6 +40,8 @@
 #include "net/tmwa/protocolout.h"
 #include "net/tmwa/sp.h"
 
+#include "resources/db/unitsdb.h"
+
 #include "debug.h"
 
 extern Net::PlayerHandler *playerHandler;
@@ -317,12 +318,12 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
             if (newMoney > oldMoney)
             {
                 NotifyManager::notify(NotifyTypes::MONEY_GET,
-                    Units::formatCurrency(newMoney - oldMoney));
+                    UnitsDb::formatCurrency(newMoney - oldMoney));
             }
             else if (newMoney < oldMoney)
             {
                 NotifyManager::notify(NotifyTypes::MONEY_SPENT,
-                    Units::formatCurrency(oldMoney - newMoney).c_str());
+                    UnitsDb::formatCurrency(oldMoney - newMoney).c_str());
             }
 
             PlayerInfo::setAttribute(Attributes::MONEY, newMoney);