summaryrefslogtreecommitdiff
path: root/src/simulation/elements/CBNW.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/simulation/elements/CBNW.cpp')
-rw-r--r--src/simulation/elements/CBNW.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/simulation/elements/CBNW.cpp b/src/simulation/elements/CBNW.cpp
index b59e5f4..59c6d66 100644
--- a/src/simulation/elements/CBNW.cpp
+++ b/src/simulation/elements/CBNW.cpp
@@ -104,13 +104,16 @@ int Element_CBNW::update(UPDATE_FUNC_ARGS)
}
if ((r&0xFF)==PT_CBNW)
{
- if(!parts[i].tmp && parts[r>>8].tmp)
+ if(!parts[i].tmp)
{
- parts[i].tmp = parts[r>>8].tmp;
- if((r>>8)>i) //If the other particle hasn't been life updated
- parts[i].tmp--;
+ if (parts[r>>8].tmp)
+ {
+ parts[i].tmp = parts[r>>8].tmp;
+ if((r>>8)>i) //If the other particle hasn't been life updated
+ parts[i].tmp--;
+ }
}
- else if(parts[i].tmp && !parts[r>>8].tmp)
+ else if(!parts[r>>8].tmp)
{
parts[r>>8].tmp = parts[i].tmp;
if((r>>8)>i) //If the other particle hasn't been life updated