diff options
| author | jacksonmj <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) |
| commit | 2ddb24d5b0dd8ea831a8ce5e84c8335165768c7b (patch) | |
| tree | d06b191e5be4da6a9a8403fb8c0477c09d0f58da /src | |
| parent | 1b5ff237c048aa83e3743e2891fb45eb5ef03fd3 (diff) | |
| download | powder-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')
| -rw-r--r-- | src/elements/h2.c | 2 | ||||
| -rw-r--r-- | src/powder.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/elements/h2.c b/src/elements/h2.c index c474236..336f496 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 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; |