diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-05 00:39:57 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-05 00:40:42 +0100 |
| commit | 550a02997572b5d090b436b7c05d19c1823556a9 (patch) | |
| tree | 65b6bf872711d67d1ed2b7e530bd47cb88a155af /src/resources/dye.cpp | |
| parent | 8b6bfeb0a70d4f97cc2d20ce04fc240b65082cf1 (diff) | |
| parent | 91387e410c9f9ea16c5b41bd1cc576cbd85cf835 (diff) | |
| download | mana-550a02997572b5d090b436b7c05d19c1823556a9.tar.gz mana-550a02997572b5d090b436b7c05d19c1823556a9.tar.bz2 mana-550a02997572b5d090b436b7c05d19c1823556a9.tar.xz mana-550a02997572b5d090b436b7c05d19c1823556a9.zip | |
Merged with 'master'
Diffstat (limited to 'src/resources/dye.cpp')
| -rw-r--r-- | src/resources/dye.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp index 3be105d8..d180d725 100644 --- a/src/resources/dye.cpp +++ b/src/resources/dye.cpp @@ -26,7 +26,7 @@ #include "../log.h" -Palette::Palette(std::string const &description) +Palette::Palette(const std::string &description) { int size = description.length(); if (size == 0) return; @@ -109,7 +109,7 @@ void Palette::getColor(int intensity, int color[3]) const color[2] = ((255 - t) * b1 + t * b2) / 255; } -Dye::Dye(std::string const &description) +Dye::Dye(const std::string &description) { for (int i = 0; i < 7; ++i) mPalettes[i] = 0; @@ -175,7 +175,7 @@ void Dye::update(int color[3]) const mPalettes[i - 1]->getColor(cmax, color); } -void Dye::instantiate(std::string &target, std::string const &palettes) +void Dye::instantiate(std::string &target, const std::string &palettes) { std::string::size_type next_pos = target.find('|'); if (next_pos == std::string::npos || palettes.empty()) return; |