diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-31 17:07:13 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-31 17:33:20 +0300 |
commit | 6683d42b636619e02e2bcf98923a2fdbf44bd95b (patch) | |
tree | 7c7bb1c27fd1b756a428b639f098b51cdeb08b94 /src/gui/palette.h | |
parent | d7c67fa2b6faa3e81269244224da4b72f045d659 (diff) | |
download | manaverse-6683d42b636619e02e2bcf98923a2fdbf44bd95b.tar.gz manaverse-6683d42b636619e02e2bcf98923a2fdbf44bd95b.tar.bz2 manaverse-6683d42b636619e02e2bcf98923a2fdbf44bd95b.tar.xz manaverse-6683d42b636619e02e2bcf98923a2fdbf44bd95b.zip |
Move functions getColor, getIdByChar from palette to theme and userpalette.
Diffstat (limited to 'src/gui/palette.h')
-rw-r--r-- | src/gui/palette.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/gui/palette.h b/src/gui/palette.h index b42ada438..fcfa40360 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -65,31 +65,6 @@ class Palette notfinal const Color &getCharColor(const signed char c, bool &valid) const A_WARN_UNUSED; - int getIdByChar(const signed char c, bool &valid) const A_WARN_UNUSED; - - /** - * Gets the color associated with the type. Sets the alpha channel - * before returning. - * - * @param type the color type requested - * @param alpha alpha channel to use - * - * @return the requested color - */ - inline const Color &getColor(int type, - const int alpha = 255) A_WARN_UNUSED - { - if (type >= static_cast<signed>(mColors.size()) || type < 0) - { - logger->log("incorrect color request type: %d from %u", - type, static_cast<unsigned int>(mColors.size())); - type = 0; - } - Color* col = &mColors[type].color; - col->a = alpha; - return *col; - } - inline const Color &getColorWithAlpha(const int type) A_WARN_UNUSED { Color *const col = &mColors[type].color; |