Permalink
Browse files

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

  • Loading branch information...
jacksonmj committed May 22, 2014
1 parent 7b9f43b commit 1b3f3aa97958e9e583c8d519a0c7738330f458bc
Showing with 6 additions and 5 deletions.
  1. +6 −5 src/simulation/elements/CRAY.cpp
@@ -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;

0 comments on commit 1b3f3aa

Please sign in to comment.