diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-05 16:25:04 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-05 16:25:04 (GMT) |
| commit | af181faeea1437df1e236f9bfc05832e9b1ca03b (patch) | |
| tree | 85e8b2c0c003037d90f2a400c3554fcb607fdacc /src/simulation/elements/BRCK.cpp | |
| parent | 774bc08c2cad7919573543d711eee826e26f670d (diff) | |
| download | powder-af181faeea1437df1e236f9bfc05832e9b1ca03b.zip powder-af181faeea1437df1e236f9bfc05832e9b1ca03b.tar.gz | |
Revert "multiple BRCK colors (suggested by Catelite)"
This reverts commit 4a8ae25299e465ab55072dd512b5818881ec5a67.
Diffstat (limited to 'src/simulation/elements/BRCK.cpp')
| -rw-r--r-- | src/simulation/elements/BRCK.cpp | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/src/simulation/elements/BRCK.cpp b/src/simulation/elements/BRCK.cpp index 9c0e471..6769aa3 100644 --- a/src/simulation/elements/BRCK.cpp +++ b/src/simulation/elements/BRCK.cpp @@ -50,34 +50,15 @@ Element_BRCK::Element_BRCK() int Element_BRCK::graphics(GRAPHICS_FUNC_ARGS) { if (cpart->tmp == 1) + { + *pixel_mode |= FIRE_ADD; *colb += 100; - else if (cpart->tmp == 2) - *colr += 100; - else if (cpart->tmp == 3) - *colg += 100; - else if (cpart->tmp == 4) { - *colg += 100; - *colb += 100; - } - else if (cpart->tmp == 5) { - *colg += 100; - *colr += 100; - } - else if (cpart->tmp == 6) { - *colr += 100; - *colb += 100; - } - else if (cpart->tmp == 7) { - *colr += 100; - *colg += 100; - *colb += 100; - } - *pixel_mode |= FIRE_ADD; - *firea = 40; - *firer = *colr; - *fireg = *colg; - *fireb = *colb; + *firea = 40; + *firer = *colr; + *fireg = *colg; + *fireb = *colb; + } return 0; } |
