diff options
| author | cracker64 <cracker642@gmail.com> | 2013-03-02 05:42:07 (GMT) |
|---|---|---|
| committer | cracker64 <cracker642@gmail.com> | 2013-03-02 05:42:07 (GMT) |
| commit | d58100dc070be97073d1f02cdbb7a382a67c376b (patch) | |
| tree | cc0fc022e7f8524b7f9bcf5ed93eb83980596f91 /src/simulation/elements/CBNW.cpp | |
| parent | a9f4b5fe343fb0ada8934030abe6363695ea43dc (diff) | |
| download | powder-d58100dc070be97073d1f02cdbb7a382a67c376b.zip powder-d58100dc070be97073d1f02cdbb7a382a67c376b.tar.gz | |
More fixes, redid a bunch of SPRK, so far everything I've tested works fine.
Diffstat (limited to 'src/simulation/elements/CBNW.cpp')
| -rw-r--r-- | src/simulation/elements/CBNW.cpp | 13 |
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 |