matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix WL_DESTROYALL for fast particles; and no H2 ignition from SPRK

Browse Source 
H2 igniting from spark causes too many problems for electrolysis
This commit is contained in:
jacksonmj 2011-06-04 14:44:14 +01:00 committed by Simon Robertshaw
parent 1b5ff237c0
commit 2ddb24d5b0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/elements/h2.c
View File

@ -21,7 +21,7 @@ int update_H2(UPDATE_FUNC_ARGS)
parts[r>>8].temp+=(rand()/(RAND_MAX/100)); parts[r>>8].temp+=(rand()/(RAND_MAX/100));
parts[r>>8].tmp |= 1; 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); create_part(i,x,y,PT_FIRE);
parts[i].temp+=(rand()/(RAND_MAX/100)); parts[i].temp+=(rand()/(RAND_MAX/100));

2
src/powder.c
View File

@ -1913,7 +1913,7 @@ killed:
clear_y = (int)(clear_yf+0.5f); clear_y = (int)(clear_yf+0.5f);
break; 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 // found an obstacle
clear_xf = fin_xf-dx; clear_xf = fin_xf-dx;