summaryrefslogtreecommitdiff
path: root/src/simulation/elements/GPMP.cpp
diff options
context:
space:
mode:
authorcracker64 <cracker642@gmail.com>2013-02-27 17:08:10 (GMT)
committer cracker64 <cracker642@gmail.com>2013-02-27 17:08:10 (GMT)
commit3d2e59415003c51c0b6dbe764003cc2012ba9ca7 (patch)
tree98bf2347be2a5ada02c4a2297b3e1c88acf72e21 /src/simulation/elements/GPMP.cpp
parent27e3e1251837f5d64e835068d5f5bd5b67b95921 (diff)
downloadpowder-3d2e59415003c51c0b6dbe764003cc2012ba9ca7.zip
powder-3d2e59415003c51c0b6dbe764003cc2012ba9ca7.tar.gz
Small modifications part three.
Diffstat (limited to 'src/simulation/elements/GPMP.cpp')
-rw-r--r--src/simulation/elements/GPMP.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/elements/GPMP.cpp b/src/simulation/elements/GPMP.cpp
index 3cf51a3..24f180a 100644
--- a/src/simulation/elements/GPMP.cpp
+++ b/src/simulation/elements/GPMP.cpp
@@ -50,9 +50,9 @@ Element_GPMP::Element_GPMP()
int Element_GPMP::update(UPDATE_FUNC_ARGS)
{
int r, rx, ry;
- if (parts[i].life>0 && parts[i].life!=10)
+ if (parts[i].life!=10 && parts[i].life>0)
parts[i].life--;
- if (parts[i].life==10)
+ else if (parts[i].life==10)
{
if (parts[i].temp>=256.0+273.15)
parts[i].temp=256.0+273.15;