matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TPT: Fix switch not activating completely while being sparked 1a5cd45eb8

Browse Source
This commit is contained in:
Simon Robertshaw 2012-04-17 17:20:48 +01:00
parent a3e97d51d1
commit 8ea1e41d87
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/elements/swch.cpp
View File

@ -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) if (parts[i].life>=10&&parts[r>>8].life<10&&parts[r>>8].life>0)
parts[i].life = 9; parts[i].life = 9;
else if (parts[i].life==0&&parts[r>>8].life==10) else if (parts[i].life==0&&parts[r>>8].life>=10)
parts[i].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) { 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); sim->part_change_type(i,x,y,PT_SPRK);