diff options
| author | cracker64 <cracker642@gmail.com> | 2013-02-27 22:20:05 (GMT) |
|---|---|---|
| committer | cracker64 <cracker642@gmail.com> | 2013-02-27 22:20:05 (GMT) |
| commit | 08d1a68ce091b6ba53788224fd1bda92c1895ca6 (patch) | |
| tree | 09593de4276750ce9abf203edb08741947ba7ab6 /src/simulation/elements/GPMP.cpp | |
| parent | 3d2e59415003c51c0b6dbe764003cc2012ba9ca7 (diff) | |
| download | powder-08d1a68ce091b6ba53788224fd1bda92c1895ca6.zip powder-08d1a68ce091b6ba53788224fd1bda92c1895ca6.tar.gz | |
More fixes.
Diffstat (limited to 'src/simulation/elements/GPMP.cpp')
| -rw-r--r-- | src/simulation/elements/GPMP.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/simulation/elements/GPMP.cpp b/src/simulation/elements/GPMP.cpp index 24f180a..d22934e 100644 --- a/src/simulation/elements/GPMP.cpp +++ b/src/simulation/elements/GPMP.cpp @@ -50,9 +50,12 @@ Element_GPMP::Element_GPMP() int Element_GPMP::update(UPDATE_FUNC_ARGS) { int r, rx, ry; - if (parts[i].life!=10 && parts[i].life>0) - parts[i].life--; - else if (parts[i].life==10) + if (parts[i].life!=10) + { + if (parts[i].life>0) + parts[i].life--; + } + else { if (parts[i].temp>=256.0+273.15) parts[i].temp=256.0+273.15; |