diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-08-22 14:14:34 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-08-22 14:14:34 +0300 |
commit | da05d9dd98315378bdded216184294f376643191 (patch) | |
tree | ffc4b984c73c3bb68d26a1df6481634254075744 /src/gui/windows/npcdialog.cpp | |
parent | ec856b2026c7ceecab5f74942bb36661d7c6ae67 (diff) | |
download | mv-da05d9dd98315378bdded216184294f376643191.tar.gz mv-da05d9dd98315378bdded216184294f376643191.tar.bz2 mv-da05d9dd98315378bdded216184294f376643191.tar.xz mv-da05d9dd98315378bdded216184294f376643191.zip |
Use resource manager as global variable.
Diffstat (limited to 'src/gui/windows/npcdialog.cpp')
-rw-r--r-- | src/gui/windows/npcdialog.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 992fd7e9c..bda9b3039 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -597,8 +597,6 @@ void NpcDialog::addChoice(const std::string &choice) void NpcDialog::parseListItems(const std::string &itemString) { std::istringstream iss(itemString); - ResourceManager *const resman = ResourceManager::getInstance(); - std::string tmp; const std::string path = paths.getStringValue("guiIcons"); while (getline(iss, tmp, ':')) @@ -614,7 +612,7 @@ void NpcDialog::parseListItems(const std::string &itemString) else { mItems.push_back(tmp.substr(pos + 1)); - Image *const img = resman->getImage(std::string( + Image *const img = resourceManager->getImage(std::string( path).append(tmp.substr(0, pos)).append(".png")); mImages.push_back(img); } |