diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-05-25 14:13:51 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-05-25 14:13:51 +0300 |
| commit | e2f03241a1ba9d6b536b0b7a6f995e4e8d894408 (patch) | |
| tree | 2bfd5cda7899a5793de62b5f47925a09eac320f5 /src/gui/windows/npcdialog.cpp | |
| parent | 59271755dc75f5de6c288308df92f687deaa32b4 (diff) | |
| download | manaplus-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.gz manaplus-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.bz2 manaplus-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.xz manaplus-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.zip | |
Move images load function from resourcemanager into separate file.
Diffstat (limited to 'src/gui/windows/npcdialog.cpp')
| -rw-r--r-- | src/gui/windows/npcdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |