summaryrefslogtreecommitdiff
path: root/src/simulation/elements/SWCH.cpp
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2012-12-04 19:38:01 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2012-12-04 19:38:01 (GMT)
commit9bf5eeeef919260458637e84f3388b4d7d8204c5 (patch)
treeee4368a61080e46849e8f8f1fd7ccf52e1f1dec9 /src/simulation/elements/SWCH.cpp
parent2a8811190cfb0a3736a24b24561dc0dc0a42b2c7 (diff)
downloadpowder-9bf5eeeef919260458637e84f3388b4d7d8204c5.zip
powder-9bf5eeeef919260458637e84f3388b4d7d8204c5.tar.gz
Fix slight particle order issue with SWCH
Diffstat (limited to 'src/simulation/elements/SWCH.cpp')
-rw-r--r--src/simulation/elements/SWCH.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/SWCH.cpp b/src/simulation/elements/SWCH.cpp
index 818af27..422b7b5 100644
--- a/src/simulation/elements/SWCH.cpp
+++ b/src/simulation/elements/SWCH.cpp
@@ -76,7 +76,7 @@ int Element_SWCH::update(UPDATE_FUNC_ARGS)
parts[i].life = parts[r>>8].life;
}
}
- else if (rt==PT_SPRK&&parts[i].life==10&&parts[r>>8].ctype!=PT_PSCN&&parts[r>>8].ctype!=PT_NSCN) {
+ else if (rt==PT_SPRK && parts[i].life==10 && parts[r>>8].life>0 && parts[r>>8].ctype!=PT_PSCN && parts[r>>8].ctype!=PT_NSCN) {
sim->part_change_type(i,x,y,PT_SPRK);
parts[i].ctype = PT_SWCH;
parts[i].life = 4;