From b8c218c89b59c9280931a1d959df0348f6103b9c Mon Sep 17 00:00:00 2001 From: mniip Date: Fri, 28 Jun 2013 15:02:50 +0400 Subject: [PATCH] shouldn't use PIXR/G/B/PACK there, would break if using a non-standard bit scheme --- src/simulation/elements/PSTN.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/simulation/elements/PSTN.cpp b/src/simulation/elements/PSTN.cpp index 35a470d92..ba2ba858c 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); } } }