summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-25 14:13:51 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-25 14:13:51 +0300
commite2f03241a1ba9d6b536b0b7a6f995e4e8d894408 (patch)
tree2bfd5cda7899a5793de62b5f47925a09eac320f5 /src/gui/windows
parent59271755dc75f5de6c288308df92f687deaa32b4 (diff)
downloadplus-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.gz
plus-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.bz2
plus-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.xz
plus-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.zip
Move images load function from resourcemanager into separate file.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/mailviewwindow.cpp4
-rw-r--r--src/gui/windows/minimap.cpp4
-rw-r--r--src/gui/windows/npcdialog.cpp4
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);
}