diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-01-13 01:33:11 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-01-13 01:33:11 +0300 |
| commit | b842de88ed73ef8df2615014ad2984b136fa4238 (patch) | |
| tree | 99b16ea96c7cb196fd143e8f14ecba893834a0d5 /src | |
| parent | 99208e8f8aba695a6fb0e4ed9f5c51108dd539f4 (diff) | |
| download | manaverse-b842de88ed73ef8df2615014ad2984b136fa4238.tar.gz manaverse-b842de88ed73ef8df2615014ad2984b136fa4238.tar.bz2 manaverse-b842de88ed73ef8df2615014ad2984b136fa4238.tar.xz manaverse-b842de88ed73ef8df2615014ad2984b136fa4238.zip | |
Fix compilation warnings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/resources/dye/dyepalette.cpp | 8 | ||||
| -rw-r--r-- | src/resources/dye/dyepalette.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/dye/dyepalette.cpp b/src/resources/dye/dyepalette.cpp index 048b350e3..e3b3964ff 100644 --- a/src/resources/dye/dyepalette.cpp +++ b/src/resources/dye/dyepalette.cpp @@ -69,9 +69,9 @@ DyePalette::DyePalette(const std::string &restrict description, } else { - DyeColor color(0, 0, 0, 0); - hexToColor(str, blockSize, color); - mColors.push_back(color); + DyeColor color2(0, 0, 0, 0); + hexToColor(str, blockSize, color2); + mColors.push_back(color2); } } return; @@ -81,7 +81,7 @@ DyePalette::DyePalette(const std::string &restrict description, } void DyePalette::hexToColor(const std::string &hexStr, - const int blockSize, + const uint8_t blockSize, DyeColor &color) { for (size_t i = 0, colorIdx = 0; diff --git a/src/resources/dye/dyepalette.h b/src/resources/dye/dyepalette.h index d405aaae1..9796f40c5 100644 --- a/src/resources/dye/dyepalette.h +++ b/src/resources/dye/dyepalette.h @@ -87,7 +87,7 @@ class DyePalette final A_CONST A_WARN_UNUSED; static void hexToColor(const std::string &hexStr, - const int blockSize, + const uint8_t blockSize, DyeColor &color); #ifndef UNITTESTS |