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.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/simulation/elements/DLAY.cpp b/src/simulation/elements/DLAY.cpp
index 1bce999..c0602db 100644
--- a/src/simulation/elements/DLAY.cpp
+++ b/src/simulation/elements/DLAY.cpp
@@ -68,17 +68,23 @@ int Element_DLAY::update(UPDATE_FUNC_ARGS)
}
else if ((r&0xFF)==PT_DLAY)
{
- if(!parts[i].life && parts[r>>8].life)
+ if (!parts[i].life)
{
- parts[i].life = parts[r>>8].life;
- if((r>>8)>i) //If the other particle hasn't been life updated
- parts[i].life--;
+ if (parts[r>>8].life)
+ {
+ parts[i].life = parts[r>>8].life;
+ if((r>>8)>i) //If the other particle hasn't been life updated
+ parts[i].life--;
+ }
}
- else if(parts[i].life && !parts[r>>8].life)
+ else
{
- parts[r>>8].life = parts[i].life;
- if((r>>8)>i) //If the other particle hasn't been life updated
- 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++;
+ }
}
}
else if((r&0xFF)==PT_NSCN && oldl==1)