← Back to branch summary

~ubuntu-branches/ubuntu/trusty/manaplus/trusty-proposed

« back to all changes in this revision

Viewing changes to src/resources/dye.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-07-11 10:09:41 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20130711100941-f0rwuvcwgl8ulqo8
Tags: 1.3.7.7.1-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/resources/dye.cpp
206
206
        if (it == it_end)
207
207
            return;
208
208
        const DyeColor &col2 = *it;
209
 
        if (color[0] == col.value[0] && color[1] == col.value[1]
210
 
            && color[2] == col.value[2])
 
209
        if (color[2] == col.value[0] && color[1] == col.value[1]
 
210
            && color[0] == col.value[2])
211
211
        {
212
212
            color[2] = col2.value[0];
213
213
            color[1] = col2.value[1];
229
229
        if (it == it_end)
230
230
            return;
231
231
        const DyeColor &col2 = *it;
232
 
        if (color[1] == col.value[0] && color[2] == col.value[1]
233
 
            && color[3] == col.value[2] && color[0] == col.value[3])
 
232
        if (color[3] == col.value[0] && color[2] == col.value[1]
 
233
            && color[1] == col.value[2] && color[0] == col.value[3])
234
234
        {
235
235
            color[3] = col2.value[0];
236
236
            color[2] = col2.value[1];
253
253
        if (it == it_end)
254
254
            return;
255
255
        const DyeColor &col2 = *it;
256
 
        if (color[2] == col.value[0] && color[1] == col.value[1]
257
 
            && color[0] == col.value[2])
 
256
        if (color[0] == col.value[0] && color[1] == col.value[1]
 
257
            && color[2] == col.value[2])
258
258
        {
259
259
            color[0] = col2.value[0];
260
260
            color[1] = col2.value[1];
276
276
        if (it == it_end)
277
277
            return;
278
278
        const DyeColor &col2 = *it;
279
 
        if (color[2] == col.value[0] && color[1] == col.value[1]
280
 
            && color[0] == col.value[2] && color[3] == col.value[3])
 
279
        if (color[0] == col.value[0] && color[1] == col.value[1]
 
280
            && color[2] == col.value[2] && color[3] == col.value[3])
281
281
        {
282
282
            color[0] = col2.value[0];
283
283
            color[1] = col2.value[1];