diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-12-27 03:30:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-12-27 03:30:58 +0300 |
| commit | 003043714367009efaf07015cc63a901ae2ee47c (patch) | |
| tree | f441091a46ac07419977a0dba4cfd6b5ceab667b /src/gui/theme.cpp | |
| parent | 916a3d76da98d078a807044c43d1a70bc146ba70 (diff) | |
| download | manaplus-003043714367009efaf07015cc63a901ae2ee47c.tar.gz manaplus-003043714367009efaf07015cc63a901ae2ee47c.tar.bz2 manaplus-003043714367009efaf07015cc63a901ae2ee47c.tar.xz manaplus-003043714367009efaf07015cc63a901ae2ee47c.zip | |
Remove default parameters from theme.
Diffstat (limited to 'src/gui/theme.cpp')
| -rw-r--r-- | src/gui/theme.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 6d9c572ba..171415ec0 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -1095,7 +1095,10 @@ void Theme::loadRect(ImageRect &image, const int start, const int end) { - Skin *const skin = load(name, name2, false); + Skin *const skin = load(name, + name2, + false, + theme->getThemePath()); if (skin != nullptr) { loadGrid(); @@ -1109,7 +1112,10 @@ Skin *Theme::loadSkinRect(ImageRect &image, const int start, const int end) { - Skin *const skin = load(name, name2); + Skin *const skin = load(name, + name2, + true, + theme->getThemePath()); if (skin != nullptr) loadGrid(); return skin; @@ -1132,7 +1138,10 @@ Image *Theme::getImageFromThemeXml(const std::string &name, if (theme == nullptr) return nullptr; - Skin *const skin = theme->load(name, name2, false); + Skin *const skin = theme->load(name, + name2, + false, + theme->getThemePath()); if (skin != nullptr) { const ImageRect &rect = skin->getBorder(); @@ -1155,7 +1164,10 @@ ImageSet *Theme::getImageSetFromThemeXml(const std::string &name, if (theme == nullptr) return nullptr; - Skin *const skin = theme->load(name, name2, false); + Skin *const skin = theme->load(name, + name2, + false, + theme->getThemePath()); if (skin != nullptr) { const ImageRect &rect = skin->getBorder(); |