Move images load function from resourcemanager into separate file.

3 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp
index 78184c671..586703937 100644
--- a/src/gui/windows/mailviewwindow.cpp
+++ b/src/gui/windows/mailviewwindow.cpp
@@ -41,7 +41,7 @@
 #include "resources/image.h"
 #include "resources/iteminfo.h"
 
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/loaders/imageloader.h"
 
 #include "resources/db/itemdb.h"
 
@@ -110,7 +110,7 @@ MailViewWindow::MailViewWindow(const MailMessage *const message) :
     {
         const ItemInfo &item = ItemDB::get(message->itemId);
         // +++ need use message->cards and ItemColorManager for colors
-        Image *const image = resourceManager->getImage(combineDye2(
+        Image *const image = ImageLoader::getImage(combineDye2(
             paths.getStringValue("itemIcons").append(
             item.getDisplay().image),
             item.getDyeIconColorsString(ItemColor_one)));
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index e21f51742..746b452fe 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -44,7 +44,7 @@
 #include "resources/map/map.h"
 #include "resources/map/metatile.h"
 
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/loaders/imageloader.h"
 
 #include "utils/gettext.h"
 #include "utils/physfstools.h"
@@ -187,7 +187,7 @@ void Minimap::setMap(const Map *const map)
             }
 
             if (!minimapName.empty())
-                mMapImage = resourceManager->getImage(minimapName);
+                mMapImage = ImageLoader::getImage(minimapName);
             else
                 mMapImage = nullptr;
             mCustomMapImage = false;
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 5b573d693..92a57da43 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -67,7 +67,7 @@
 
 #include "resources/item/complexitem.h"
 
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/loaders/imageloader.h"
 
 #include "net/npchandler.h"
 #include "net/packetlimiter.h"
@@ -730,7 +730,7 @@ void NpcDialog::parseListItems(const std::string &itemString)
         else
         {
             mItems.push_back(tmp.substr(pos + 1));
-            Image *const img = resourceManager->getImage(std::string(
+            Image *const img = ImageLoader::getImage(std::string(
                 path).append(tmp.substr(0, pos)).append(".png"));
             mImages.push_back(img);
         }