summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-08-12 19:21:00 (GMT)
committer Simon <simon@hardwired.org.uk>2010-08-12 19:21:00 (GMT)
commit7433c2767e514f16bf46a365d68704fae257d518 (patch)
tree4cfae35236c63c52a92cdd39d6b1ddc309c3ffb5
parent1a629e91004f504098c8f30733b18d9c8f2f2b75 (diff)
downloadpowder-7433c2767e514f16bf46a365d68704fae257d518.zip
powder-7433c2767e514f16bf46a365d68704fae257d518.tar.gz
More Switch fix
-rwxr-xr-xpowder.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/powder.c b/powder.c
index a09af36..ce4549c 100755
--- a/powder.c
+++ b/powder.c
@@ -1895,6 +1895,16 @@ void update_particles_i(pixel *vid, int start, int inc){
}
}
}
+ pavg = parts_avg(i, r>>8);
+ if(t==PT_SWCH&&pavg!= PT_INSL){
+ if(parts[r>>8].type == PT_SWCH){
+ 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;
+ }
+ }
+ }
if(rt==PT_SWCH && t==PT_SPRK){
pavg = parts_avg(r>>8, i);
if(parts[i].ctype == PT_PSCN&&pavg != PT_INSL)