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

Make black deco FILT with any tmp affect CRAY beam, not just tmp=0

Browse Source
This commit is contained in:
jacksonmj 2014-05-23 00:58:34 +01:00
parent 7b9f43b8bf
commit 1b3f3aa979
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/simulation/elements/CRAY.cpp
View File

@ -104,13 +104,14 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS)
docontinue = 0;
}
} else if ((r&0xFF)==PT_FILT) { // get color if passed through FILT
if (parts[r>>8].tmp==0)
if (parts[r>>8].dcolour == 0xFF000000)
colored = 0xFF000000;
else if (parts[r>>8].tmp==0)
{
if (parts[r>>8].dcolour == 0xFF000000)
colored = 0xFF000000;
else
colored = wavelengthToDecoColour(Element_FILT::getWavelengths(&parts[r>>8]));
colored = wavelengthToDecoColour(Element_FILT::getWavelengths(&parts[r>>8]));
}
else if (colored==0xFF000000)
colored = 0;
parts[r>>8].life = 4;
} else if ((r&0xFF) == PT_CRAY || nostop) {
docontinue = 1;