diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-12 18:26:47 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-12 18:26:47 (GMT) |
| commit | 780682c22d6215e655d53c0adb167d9064947928 (patch) | |
| tree | 50fa4f7a56e81be324eafecfbcd26160b455142f /src/simulation/elements/ELEC.cpp | |
| parent | a93caaa3c7fbb0f3ac7d9edf46eb2b4a89f0aeab (diff) | |
| download | powder-780682c22d6215e655d53c0adb167d9064947928.zip powder-780682c22d6215e655d53c0adb167d9064947928.tar.gz | |
TPT: oxygen fusion, fix two small bugs
Diffstat (limited to 'src/simulation/elements/ELEC.cpp')
| -rw-r--r-- | src/simulation/elements/ELEC.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/ELEC.cpp b/src/simulation/elements/ELEC.cpp index c0f92db..4081f83 100644 --- a/src/simulation/elements/ELEC.cpp +++ b/src/simulation/elements/ELEC.cpp @@ -127,7 +127,7 @@ int Element_ELEC::update(UPDATE_FUNC_ARGS) sim->kill_part(i); return 1; } - if ((sim->elements[r&0xFF].Properties & PROP_CONDUCTS) && ((r&0xFF)!=PT_H2||parts[i].temp<2273.15)) + if ((sim->elements[r&0xFF].Properties & PROP_CONDUCTS) && ((r&0xFF)!=PT_NBLE||parts[i].temp<2273.15)) { sim->create_part(-1, x+rx, y+ry, PT_SPRK); sim->kill_part(i); |