Permalink
Browse files

Prevent red BRAY from affecting FILT colour via DTEC

  • Loading branch information...
jacksonmj committed Mar 27, 2014
1 parent 4e478cf commit 11997cf3ad183d821c3103c0b553658eba554522
Showing with 4 additions and 3 deletions.
  1. +1 −0 src/simulation/elements/ARAY.cpp
  2. +2 −2 src/simulation/elements/BRAY.cpp
  3. +1 −1 src/simulation/elements/DTEC.cpp
@@ -138,6 +138,7 @@ int Element_ARAY::update(UPDATE_FUNC_ARGS)
}
} else if (destroy) {
if ((r&0xFF)==PT_BRAY) {
parts[r>>8].tmp = 2;
parts[r>>8].life = 1;
docontinue = 1;
//this if prevents red BRAY from stopping on certain materials
@@ -55,7 +55,7 @@ int Element_BRAY::graphics(GRAPHICS_FUNC_ARGS)
{
trans = cpart->life * 7;
if (trans>255) trans = 255;
if (cpart->ctype) {
if (cpart->ctype&0x3FFFFFFF) {
*colg = 0;
*colb = 0;
*colr = 0;
@@ -75,7 +75,7 @@ int Element_BRAY::graphics(GRAPHICS_FUNC_ARGS)
{
trans = cpart->life/4;
if (trans>255) trans = 255;
if (cpart->ctype) {
if (cpart->ctype&0x3FFFFFFF) {
*colg = 0;
*colb = 0;
*colr = 0;
@@ -86,7 +86,7 @@ int Element_DTEC::update(UPDATE_FUNC_ARGS)
continue;
if ((r&0xFF) == parts[i].ctype && (parts[i].ctype != PT_LIFE || parts[i].tmp == parts[r>>8].ctype || !parts[i].tmp))
parts[i].life = 1;
if ((r&0xFF) == PT_PHOT || (r&0xFF) == PT_BRAY)
if ((r&0xFF) == PT_PHOT || ((r&0xFF) == PT_BRAY && parts[r>>8].tmp!=2))
{
setFilt = true;
photonWl = parts[r>>8].ctype;

0 comments on commit 11997cf

Please sign in to comment.