diff options
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/mailviewwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/minimap.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/npcdialog.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp index 879fa804a..54c3edca7 100644 --- a/src/gui/windows/mailviewwindow.cpp +++ b/src/gui/windows/mailviewwindow.cpp @@ -112,7 +112,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 = Loader::getImage(combineDye2( - paths.getStringValue("itemIcons").append( + pathJoin(paths.getStringValue("itemIcons"), item.getDisplay().image), item.getDyeIconColorsString(ItemColor_one))); diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index e43ea4138..2a2d6830a 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -186,8 +186,8 @@ void Minimap::setMap(const Map *const map) if (minimapName.empty()) { - tempname = std::string("graphics/minimaps/").append( - map->getFilename()).append(".png"); + tempname = pathJoin("graphics/minimaps", + std::string(map->getFilename()).append(".png")); if (VirtFs::exists(tempname)) minimapName = tempname; } diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 1c7fca17e..e1b139bd8 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -717,8 +717,8 @@ void NpcDialog::parseListItems(const std::string &itemString) else { mItems.push_back(tmp.substr(pos + 1)); - Image *const img = Loader::getImage(std::string( - path).append(tmp.substr(0, pos)).append(".png")); + Image *const img = Loader::getImage(pathJoin(path, + std::string(tmp.substr(0, pos)).append(".png"))); mImages.push_back(img); } } |