diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-06-11 23:16:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-06-11 23:16:04 +0300 |
| commit | fe01452d2448a8033dfff33a052f5a674dfc1a43 (patch) | |
| tree | a96dbe854d04d65305292112d4f9f1c992b6013e | |
| parent | dde2d920e07d651b9571ada0b4c6a8cc58e4982a (diff) | |
| download | plus-fe01452d2448a8033dfff33a052f5a674dfc1a43.tar.gz plus-fe01452d2448a8033dfff33a052f5a674dfc1a43.tar.bz2 plus-fe01452d2448a8033dfff33a052f5a674dfc1a43.tar.xz plus-fe01452d2448a8033dfff33a052f5a674dfc1a43.zip | |
fix channel search order in S and A dye.
| -rw-r--r-- | src/resources/dye.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp index 9997fc6ae..93edbabbc 100644 --- a/src/resources/dye.cpp +++ b/src/resources/dye.cpp @@ -206,8 +206,8 @@ void DyePalette::replaceSColor(uint8_t *const color) const if (it == it_end) return; const DyeColor &col2 = *it; - if (color[0] == col.value[0] && color[1] == col.value[1] - && color[2] == col.value[2]) + if (color[2] == col.value[0] && color[1] == col.value[1] + && color[0] == col.value[2]) { color[2] = col2.value[0]; color[1] = col2.value[1]; @@ -229,8 +229,8 @@ void DyePalette::replaceAColor(uint8_t *const color) const if (it == it_end) return; const DyeColor &col2 = *it; - if (color[1] == col.value[0] && color[2] == col.value[1] - && color[3] == col.value[2] && color[0] == col.value[3]) + if (color[3] == col.value[0] && color[2] == col.value[1] + && color[1] == col.value[2] && color[0] == col.value[3]) { color[3] = col2.value[0]; color[2] = col2.value[1]; @@ -253,8 +253,8 @@ void DyePalette::replaceSOGLColor(uint8_t *const color) const if (it == it_end) return; const DyeColor &col2 = *it; - if (color[2] == col.value[0] && color[1] == col.value[1] - && color[0] == col.value[2]) + if (color[0] == col.value[0] && color[1] == col.value[1] + && color[2] == col.value[2]) { color[0] = col2.value[0]; color[1] = col2.value[1]; @@ -276,8 +276,8 @@ void DyePalette::replaceAOGLColor(uint8_t *const color) const if (it == it_end) return; const DyeColor &col2 = *it; - if (color[2] == col.value[0] && color[1] == col.value[1] - && color[0] == col.value[2] && color[3] == col.value[3]) + if (color[0] == col.value[0] && color[1] == col.value[1] + && color[2] == col.value[2] && color[3] == col.value[3]) { color[0] = col2.value[0]; color[1] = col2.value[1]; |