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

Make FILT tmp=6 ("no effect" mode) work with CRAY

Browse Source 
(Other FILT modes still don't work with CRAY, only tmp=0 or 6)
This commit is contained in:
jacksonmj 2014-03-09 09:37:37 +00:00
parent 9531de49ec
commit e5941950ba
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,10 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS)
docontinue = 0; docontinue = 0;
} }
} else if ((r&0xFF)==PT_FILT) { // get color if passed through FILT } else if ((r&0xFF)==PT_FILT) { // get color if passed through FILT
colored = wavelengthToDecoColour(Element_FILT::getWavelengths(&parts[r>>8])); if (parts[r>>8].tmp==0)
{
colored = wavelengthToDecoColour(Element_FILT::getWavelengths(&parts[r>>8]));
}
} else if ((r&0xFF) == PT_CRAY || nostop) { } else if ((r&0xFF) == PT_CRAY || nostop) {
docontinue = 1; docontinue = 1;
} else if(destroy && r && ((r&0xFF) != PT_DMND)) { } else if(destroy && r && ((r&0xFF) != PT_DMND)) {