diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-05-25 19:32:59 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-05-25 19:32:59 +0300 |
commit | 1b1a7cea1c6b81438bacc86b93cb80a78430790f (patch) | |
tree | d23f4e0beea6b4e5c570afafd9ad9de6b68ba812 /src/gui/windows | |
parent | bb8be1acea37f09c134d7d4042869a679cf8a12b (diff) | |
download | manaplus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.gz manaplus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.bz2 manaplus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.xz manaplus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.zip |
Change namespace in resources loaders from other to Loader.
Diffstat (limited to 'src/gui/windows')
-rw-r--r-- | src/gui/windows/mailviewwindow.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/minimap.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/npcdialog.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp index 586703937..eb075a624 100644 --- a/src/gui/windows/mailviewwindow.cpp +++ b/src/gui/windows/mailviewwindow.cpp @@ -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 = ImageLoader::getImage(combineDye2( + Image *const image = Loader::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 746b452fe..1677169e0 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -187,7 +187,7 @@ void Minimap::setMap(const Map *const map) } if (!minimapName.empty()) - mMapImage = ImageLoader::getImage(minimapName); + mMapImage = Loader::getImage(minimapName); else mMapImage = nullptr; mCustomMapImage = false; diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 92a57da43..b4323feb6 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -730,7 +730,7 @@ void NpcDialog::parseListItems(const std::string &itemString) else { mItems.push_back(tmp.substr(pos + 1)); - Image *const img = ImageLoader::getImage(std::string( + Image *const img = Loader::getImage(std::string( path).append(tmp.substr(0, pos)).append(".png")); mImages.push_back(img); } |