From 8ea1e41d8737cbd2cc5f7ca6779cc0a8031dac85 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Tue, 17 Apr 2012 17:20:48 +0100 Subject: [PATCH] TPT: Fix switch not activating completely while being sparked 1a5cd45eb8 --- src/elements/swch.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/elements/swch.cpp b/src/elements/swch.cpp index f37192b27..4adc27077 100644 --- a/src/elements/swch.cpp +++ b/src/elements/swch.cpp @@ -17,8 +17,11 @@ int update_SWCH(UPDATE_FUNC_ARGS) { { if (parts[i].life>=10&&parts[r>>8].life<10&&parts[r>>8].life>0) parts[i].life = 9; - else if (parts[i].life==0&&parts[r>>8].life==10) - parts[i].life = 10; + else if (parts[i].life==0&&parts[r>>8].life>=10) + { + //Set to other particle's life instead of 10, otherwise spark loops form when SWCH is sparked while turning on + 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) { sim->part_change_type(i,x,y,PT_SPRK);