summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2010-08-13 11:15:07 (GMT)
committer Simon <simon@hardwired.org.uk>2010-08-13 11:15:07 (GMT)
commite02d78c85d41bb8add66e80a84f8b7b3e3270033 (patch)
tree6751500701309e26ac0fe93a12252ef3adc2fe27
parentc77c550eac5dc4cc8538b778be57fbf1be5cbe6d (diff)
downloadpowder-e02d78c85d41bb8add66e80a84f8b7b3e3270033.zip
powder-e02d78c85d41bb8add66e80a84f8b7b3e3270033.tar.gz
Fixes my tragic attempt at logic.
-rwxr-xr-xpowder.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/powder.c b/powder.c
index 8f9c6e8..5a34b56 100755
--- a/powder.c
+++ b/powder.c
@@ -2152,8 +2152,8 @@ void update_particles_i(pixel *vid, int start, int inc){
{
create_part(-1, nx, ny, player[2]);
r = pmap[ny][nx];
- if(!((r>>8)>=NPART)||(r>>8)<0)
- parts[r>>8].vx = parts[r>>8].vx + 5*((((int)player[1])&0x02) == 0x02) - 5*(((int)(player[1])&0x01) == 0x01);
+ if( ((r>>8) < NPART) && (r>>8)>=0 )
+ parts[r>>8].vx = parts[r>>8].vx + 5*((((int)player[1])&0x02) == 0x02) - 5*(((int)(player[1])&0x01) == 0x01);
}
}
}