From e5941950ba7b4afe037551db85874079b7ec7c9c Mon Sep 17 00:00:00 2001 From: jacksonmj Date: Sun, 9 Mar 2014 09:37:37 +0000 Subject: [PATCH] Make FILT tmp=6 ("no effect" mode) work with CRAY (Other FILT modes still don't work with CRAY, only tmp=0 or 6) --- src/simulation/elements/CRAY.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp index 002ed283c..1cdb66ea9 100644 --- a/src/simulation/elements/CRAY.cpp +++ b/src/simulation/elements/CRAY.cpp @@ -103,7 +103,10 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS) docontinue = 0; } } 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) { docontinue = 1; } else if(destroy && r && ((r&0xFF) != PT_DMND)) {