summaryrefslogtreecommitdiff
path: root/src/simulation/elements/ELEC.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-09-14 02:02:03 (GMT)
committer jacob1 <jfu614@gmail.com>2013-09-14 02:02:03 (GMT)
commitae8e5e5c343d033914515d72c44ad511b0aca2a3 (patch)
tree773508fe58102f43cd2d9b83d24638487e3004c0 /src/simulation/elements/ELEC.cpp
parent830bb3ba5e37f547f836a9c793f6084b305a4bfb (diff)
downloadpowder-ae8e5e5c343d033914515d72c44ad511b0aca2a3.zip
powder-ae8e5e5c343d033914515d72c44ad511b0aca2a3.tar.gz
PROT+DEUT causes DEUT implosion (same as with NEUT, just negative pressure)
Also PHOT+H2 now also make PROT+ELEC (which will not combine to make more H2)
Diffstat (limited to 'src/simulation/elements/ELEC.cpp')
-rw-r--r--src/simulation/elements/ELEC.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/simulation/elements/ELEC.cpp b/src/simulation/elements/ELEC.cpp
index 871b61e..f49d3a6 100644
--- a/src/simulation/elements/ELEC.cpp
+++ b/src/simulation/elements/ELEC.cpp
@@ -88,8 +88,10 @@ int Element_ELEC::update(UPDATE_FUNC_ARGS)
else
sim->create_part(r>>8, x+rx, y+ry, PT_H2);
return 1;
- case PT_NEUT:
case PT_PROT: // this is the correct reaction, not NEUT, but leaving NEUT in anyway
+ if (parts[r>>8].tmp2 & 0x1)
+ break;
+ case PT_NEUT:
sim->part_change_type(r>>8, x+rx, y+ry, PT_H2);
parts[r>>8].life = 0;
parts[r>>8].ctype = 0;