From 1b3f3aa97958e9e583c8d519a0c7738330f458bc Mon Sep 17 00:00:00 2001
From: jacksonmj <mj-pt@jacksonmj.co.uk>
Date: Fri, 23 May 2014 00:58:34 +0100
Subject: [PATCH] Make black deco FILT with any tmp affect CRAY beam, not just
 tmp=0

---
 src/simulation/elements/CRAY.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp
index 756f98d79..742eca31a 100644
--- a/src/simulation/elements/CRAY.cpp
+++ b/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;