Permalink
Browse files

make sure no effect FILT mode doesn't affect BRAY

  • Loading branch information...
jacob1 committed Apr 30, 2014
1 parent 462bb78 commit 8dad0483cf7fd24436fd59624125bf62bcc9ca62
Showing with 7 additions and 4 deletions.
  1. +7 −4 src/simulation/elements/ARAY.cpp
@@ -98,10 +98,13 @@ int Element_ARAY::update(UPDATE_FUNC_ARGS)
break;
}
} else if ((r&0xFF)==PT_FILT) {//get color if passed through FILT
colored = Element_FILT::interactWavelengths(&parts[r>>8], colored);
if (!colored)
break;
//this if prevents BRAY from stopping on certain materials
if (parts[r>>8].tmp != 6)
{
colored = Element_FILT::interactWavelengths(&parts[r>>8], colored);
if (!colored)
break;
}
//this if prevents BRAY from stopping on certain materials
} else if ((r&0xFF)!=PT_STOR && (r&0xFF)!=PT_INWR && ((r&0xFF)!=PT_SPRK || parts[r>>8].ctype!=PT_INWR) && (r&0xFF)!=PT_ARAY && (r&0xFF)!=PT_WIFI && !((r&0xFF)==PT_SWCH && parts[r>>8].life>=10)) {
if (nyy!=0 || nxx!=0) {
sim->create_part(-1, x+nxi+nxx, y+nyi+nyy, PT_SPRK);

0 comments on commit 8dad048

Please sign in to comment.