diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-12 18:11:57 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-12 18:11:57 (GMT) |
| commit | a93caaa3c7fbb0f3ac7d9edf46eb2b4a89f0aeab (patch) | |
| tree | cc7b147c1fd7bc983fb952f0264c9ff11d4fcbb6 /src/simulation/elements/ELEC.cpp | |
| parent | 7f921924f56f3beb569fd1d8c2f233fbb7f895ea (diff) | |
| download | powder-a93caaa3c7fbb0f3ac7d9edf46eb2b4a89f0aeab.zip powder-a93caaa3c7fbb0f3ac7d9edf46eb2b4a89f0aeab.tar.gz | |
TPT: fusion changes
Diffstat (limited to 'src/simulation/elements/ELEC.cpp')
| -rw-r--r-- | src/simulation/elements/ELEC.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/elements/ELEC.cpp b/src/simulation/elements/ELEC.cpp index 16bad1a..c0f92db 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].tmp!=1)) + if ((sim->elements[r&0xFF].Properties & PROP_CONDUCTS) && ((r&0xFF)!=PT_H2||parts[i].temp<2273.15)) { sim->create_part(-1, x+rx, y+ry, PT_SPRK); sim->kill_part(i); @@ -153,4 +153,4 @@ int Element_ELEC::graphics(GRAPHICS_FUNC_ARGS) } -Element_ELEC::~Element_ELEC() {}
\ No newline at end of file +Element_ELEC::~Element_ELEC() {} |
