matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #143 from mniip/foo

Browse Source 
fix PSTN coloring
This commit is contained in:
jacob1 2013-07-02 13:49:19 -07:00
commit e8b0e31656
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simulation/elements/PSTN.cpp
View File

@ -138,10 +138,8 @@ int Element_PSTN::update(UPDATE_FUNC_ARGS)
parts[nr].life = 1; parts[nr].life = 1;
if (parts[i].dcolour) if (parts[i].dcolour)
{ {
int red = PIXR(parts[i].dcolour)&0xFF; int colour=parts[i].dcolour;
int green = PIXG(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);
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);
} }
} }
} }