diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-29 09:36:32 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-29 09:36:32 (GMT) |
| commit | 48be91e4df50ecb5cc52e21556dce0df8474666e (patch) | |
| tree | 9465115c666da9413fac882ec8b9b1813c5c83eb /src/simulation/elements/ELEC.cpp | |
| parent | e08bc6680bb766305486fdbe1d8e6cb6482993af (diff) | |
| parent | 32bdcb89e8609b43e24493d54c57d0fb552a5331 (diff) | |
| download | powder-48be91e4df50ecb5cc52e21556dce0df8474666e.zip powder-48be91e4df50ecb5cc52e21556dce0df8474666e.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/PowderToypp
Diffstat (limited to 'src/simulation/elements/ELEC.cpp')
| -rw-r--r-- | src/simulation/elements/ELEC.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/simulation/elements/ELEC.cpp b/src/simulation/elements/ELEC.cpp index e9d1f5a..c602da8 100644 --- a/src/simulation/elements/ELEC.cpp +++ b/src/simulation/elements/ELEC.cpp @@ -123,7 +123,6 @@ int Element_ELEC::update(UPDATE_FUNC_ARGS) if(parts[r>>8].life < 6000) parts[r>>8].life += 1; parts[r>>8].temp = 0; - parts[i].temp = 0; sim->kill_part(i); return 1; } |