summaryrefslogtreecommitdiff
path: root/src/powder.c
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2011-06-04 13:44:14 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-06-08 11:47:03 (GMT)
commit2ddb24d5b0dd8ea831a8ce5e84c8335165768c7b (patch)
treed06b191e5be4da6a9a8403fb8c0477c09d0f58da /src/powder.c
parent1b5ff237c048aa83e3743e2891fb45eb5ef03fd3 (diff)
downloadpowder-2ddb24d5b0dd8ea831a8ce5e84c8335165768c7b.zip
powder-2ddb24d5b0dd8ea831a8ce5e84c8335165768c7b.tar.gz
Fix WL_DESTROYALL for fast particles; and no H2 ignition from SPRK
H2 igniting from spark causes too many problems for electrolysis
Diffstat (limited to 'src/powder.c')
-rw-r--r--src/powder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c
index b8bfe85..a0214bb 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -1913,7 +1913,7 @@ killed:
clear_y = (int)(clear_yf+0.5f);
break;
}
- if (fin_x<CELL || fin_y<CELL || fin_x>=XRES-CELL || fin_y>=YRES-CELL || pmap[fin_y][fin_x] || (bmap[fin_y/CELL][fin_x/CELL] && !eval_move(t,fin_x,fin_y,NULL)))
+ if (fin_x<CELL || fin_y<CELL || fin_x>=XRES-CELL || fin_y>=YRES-CELL || pmap[fin_y][fin_x] || (bmap[fin_y/CELL][fin_x/CELL] && (bmap[fin_y/CELL][fin_x/CELL]==WL_DESTROYALL || bmap[fin_y/CELL][fin_x/CELL]==WL_DETECT || !eval_move(t,fin_x,fin_y,NULL))))
{
// found an obstacle
clear_xf = fin_xf-dx;