From 2ddb24d5b0dd8ea831a8ce5e84c8335165768c7b Mon Sep 17 00:00:00 2001 From: jacksonmj Date: Sat, 4 Jun 2011 14:44:14 +0100 Subject: [PATCH] Fix WL_DESTROYALL for fast particles; and no H2 ignition from SPRK H2 igniting from spark causes too many problems for electrolysis --- src/elements/h2.c | 2 +- src/powder.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/elements/h2.c b/src/elements/h2.c index c474236d8..336f496e2 100644 --- a/src/elements/h2.c +++ b/src/elements/h2.c @@ -21,7 +21,7 @@ int update_H2(UPDATE_FUNC_ARGS) parts[r>>8].temp+=(rand()/(RAND_MAX/100)); parts[r>>8].tmp |= 1; } - if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM || (r&0xFF)==PT_SPRK || (r&0xFF)==PT_LAVA) + if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM || (r&0xFF)==PT_LAVA) { create_part(i,x,y,PT_FIRE); parts[i].temp+=(rand()/(RAND_MAX/100)); diff --git a/src/powder.c b/src/powder.c index b8bfe8506..a0214bbca 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=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=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;