diff options
| author | mniip <mniip@mniip.com> | 2013-06-28 11:02:50 (GMT) |
|---|---|---|
| committer | mniip <mniip@mniip.com> | 2013-06-28 11:02:50 (GMT) |
| commit | b8c218c89b59c9280931a1d959df0348f6103b9c (patch) | |
| tree | 701efc773412f386327834161c67f6e279dd3ebf /src/simulation/elements/PSTN.cpp | |
| parent | 66f250b29deb6eaf3c5e6605574af474bdda943e (diff) | |
| download | powder-b8c218c89b59c9280931a1d959df0348f6103b9c.zip powder-b8c218c89b59c9280931a1d959df0348f6103b9c.tar.gz | |
shouldn't use PIXR/G/B/PACK there, would break if using a non-standard bit scheme
Diffstat (limited to 'src/simulation/elements/PSTN.cpp')
| -rw-r--r-- | src/simulation/elements/PSTN.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/simulation/elements/PSTN.cpp b/src/simulation/elements/PSTN.cpp index 35a470d..ba2ba85 100644 --- a/src/simulation/elements/PSTN.cpp +++ b/src/simulation/elements/PSTN.cpp @@ -138,10 +138,8 @@ int Element_PSTN::update(UPDATE_FUNC_ARGS) parts[nr].life = 1; if (parts[i].dcolour) { - int red = PIXR(parts[i].dcolour)&0xFF; - int green = PIXG(parts[i].dcolour); - int blue = PIXB(parts[i].dcolour); - parts[nr].dcolour = 255<<24|PIXRGB(red>60?red-60:0, green>60?green-60:0, blue>60?blue-60:0); + int colour=parts[i].dcolour; + parts[nr].dcolour=(colour&0xFF000000)|std::max(colour&0xFF0000-0x3C0000,0)|std::max(colour&0xFF00-0x3C00,0)|std::max(colour&0xFF-0x3C,0); } } } |
