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

Fix NTCT / PTCT / INWR triggering EMP blasts ...

Browse Source
This commit is contained in:
jacob1 2015-12-19 02:44:20 -05:00
parent d92f356f8d
commit 2725a32b8e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/simulation/elements/SPRK.cpp
View File

@ -239,6 +239,7 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS)
if (receiver==PT_NTCT||receiver==PT_PTCT) if (receiver==PT_NTCT||receiver==PT_PTCT)
continue; continue;
} }
break;
case PT_EMP: case PT_EMP:
if (!parts[r>>8].life && parts[i].life > 0 && parts[i].life < 4) if (!parts[r>>8].life && parts[i].life > 0 && parts[i].life < 4)
{ {
@ -248,7 +249,7 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS)
sim->emp_decor = 40; sim->emp_decor = 40;
parts[r>>8].life = 220; parts[r>>8].life = 220;
} }
break; continue;
} }
if (pavg == PT_INSL) continue; //Insulation blocks everything past here if (pavg == PT_INSL) continue; //Insulation blocks everything past here