diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-08-03 02:11:25 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-08-04 23:57:02 +0300 |
| commit | 0647852f65598ef9cb9ebff6dfb508e8b1a98c1c (patch) | |
| tree | 4cc9395e820e60f3d511351b78fe187e897a8c7e /src/gui/theme.h | |
| parent | c52472123eb7847b5cee6b1898c42ef25a5466dd (diff) | |
| download | manaplus-0647852f65598ef9cb9ebff6dfb508e8b1a98c1c.tar.gz manaplus-0647852f65598ef9cb9ebff6dfb508e8b1a98c1c.tar.bz2 manaplus-0647852f65598ef9cb9ebff6dfb508e8b1a98c1c.tar.xz manaplus-0647852f65598ef9cb9ebff6dfb508e8b1a98c1c.zip | |
Add support for default theme file names.
Diffstat (limited to 'src/gui/theme.h')
| -rw-r--r-- | src/gui/theme.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/theme.h b/src/gui/theme.h index 216b19802..2a3a4aa2d 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -161,6 +161,7 @@ class Theme : public Palette, public ConfigListener int w, int h); ImageSet *getImageSetFromThemeXml(const std::string &name, + const std::string &name2, int w, int h); enum ThemePalette { @@ -261,11 +262,12 @@ class Theme : public Palette, public ConfigListener /** * Loads a skin. */ - Skin *load(const std::string &filename, bool full = true, - const std::string &defaultPath = getThemePath()); + Skin *load(const std::string &filename, const std::string &filename2, + bool full = true, const std::string + &defaultPath = getThemePath()); Skin *loadSkinRect(ImageRect &image, std::string name, - int start = 0, int end = 8); + std::string name2, int start = 0, int end = 8); void unload(Skin *skin); @@ -288,12 +290,13 @@ class Theme : public Palette, public ConfigListener void optionChanged(const std::string &); - void loadRect(ImageRect &image, std::string name, + void loadRect(ImageRect &image, std::string name, std::string name2, int start = 0, int end = 8); void unloadRect(ImageRect &rect, int start = 0, int end = 8); - static Image *getImageFromThemeXml(const std::string &name); + static Image *getImageFromThemeXml(const std::string &name, + const std::string &name2); private: Theme(); |