summaryrefslogtreecommitdiff
path: root/src/simulation/elements/DLAY.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/simulation/elements/DLAY.cpp')
-rw-r--r--src/simulation/elements/DLAY.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/simulation/elements/DLAY.cpp b/src/simulation/elements/DLAY.cpp
index c0602db..d0dd4c1 100644
--- a/src/simulation/elements/DLAY.cpp
+++ b/src/simulation/elements/DLAY.cpp
@@ -77,14 +77,11 @@ int Element_DLAY::update(UPDATE_FUNC_ARGS)
parts[i].life--;
}
}
- else
+ else if (!parts[r>>8].life)
{
- if (!parts[r>>8].life)
- {
- parts[r>>8].life = parts[i].life;
- if((r>>8)>i) //If the other particle hasn't been life updated
- parts[r>>8].life++;
- }
+ parts[r>>8].life = parts[i].life;
+ if((r>>8)>i) //If the other particle hasn't been life updated
+ parts[r>>8].life++;
}
}
else if((r&0xFF)==PT_NSCN && oldl==1)