diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/elements/pipe.c | 10 | ||||
| -rw-r--r-- | src/elements/stor.c | 43 | ||||
| -rw-r--r-- | src/powder.c | 6 |
3 files changed, 57 insertions, 2 deletions
diff --git a/src/elements/pipe.c b/src/elements/pipe.c index af008dc..9e060b5 100644 --- a/src/elements/pipe.c +++ b/src/elements/pipe.c @@ -152,6 +152,16 @@ int update_PIPE(UPDATE_FUNC_ARGS) { parts[i].pavg[1] = parts[r>>8].ctype; kill_part(r>>8); } + else if ((parts[i].tmp&0xFF) == 0 && (r&0xFF)==PT_STOR && parts[r>>8].tmp && (ptypes[parts[r>>8].tmp].falldown!= 0 || ptypes[parts[r>>8].tmp].state == ST_GAS)) + { + parts[i].tmp = parts[r>>8].tmp; + parts[i].temp = parts[r>>8].temp; + parts[i].flags = parts[r>>8].flags; + parts[i].pavg[0] = parts[r>>8].pavg[0]; + parts[i].pavg[1] = parts[r>>8].pavg[1]; + parts[r>>8].tmp = 0; + parts[r>>8].life = 0; + } } } } diff --git a/src/elements/stor.c b/src/elements/stor.c new file mode 100644 index 0000000..1f2558f --- /dev/null +++ b/src/elements/stor.c @@ -0,0 +1,43 @@ +#include <element.h> + +int update_STOR(UPDATE_FUNC_ARGS) { + int r, rx, ry, np, rx1, ry1; + if(parts[i].life && !parts[i].tmp) + parts[i].life--; + for (rx=-2; rx<3; rx++) + for (ry=-2; ry<3; ry++) + if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) + { + r = pmap[y+ry][x+rx]; + if ((r>>8)>=NPART || !r) + continue; + if (!parts[i].tmp && !parts[i].life && (r&0xFF)!=PT_STOR && (r&0xFF)==parts[i].ctype && !(ptypes[(r&0xFF)].properties&TYPE_SOLID)) + { + parts[i].tmp = parts[r>>8].type; + parts[i].temp = parts[r>>8].temp; + parts[i].flags = parts[r>>8].life; + parts[i].pavg[0] = parts[r>>8].tmp; + parts[i].pavg[1] = parts[r>>8].ctype; + kill_part(r>>8); + } + if(parts[i].tmp && (r&0xFF)==PT_SPRK && parts[r>>8].ctype==PT_PSCN) + { + for(rx1 = 1; rx1 >= -1; rx1--){ + for(ry1 = 0; ry1 >= -1 && ry1 <= 1; ry1 = -ry1-ry1+1){ // Oscilate the Y starting at 0, 1, -1, 3, -5, etc (Though stop at -1) + np = create_part(-1,x+rx1,y+ry1,parts[i].tmp); + if (np!=-1) + { + parts[np].temp = parts[i].temp; + parts[np].life = parts[i].flags; + parts[np].tmp = parts[i].pavg[0]; + parts[np].ctype = parts[i].pavg[1]; + parts[i].tmp = 0; + parts[i].life = 10; + break; + } + } + } + } + } + return 0; +} diff --git a/src/powder.c b/src/powder.c index 4f763a3..3b76a5d 100644 --- a/src/powder.c +++ b/src/powder.c @@ -752,6 +752,7 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a if (pmap[y][x]) { if (( + (pmap[y][x]&0xFF)==PT_STOR|| (pmap[y][x]&0xFF)==PT_CLNE|| (pmap[y][x]&0xFF)==PT_BCLN|| ((pmap[y][x]&0xFF)==PT_PCLN&&t!=PT_PSCN&&t!=PT_NSCN)|| @@ -759,11 +760,12 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a )&&( t!=PT_CLNE&&t!=PT_PCLN&& t!=PT_BCLN&&t!=PT_STKM&& - t!=PT_STKM2&&t!=PT_PBCN) + t!=PT_STKM2&&t!=PT_PBCN&& + t!=PT_STOR) ) { parts[pmap[y][x]>>8].ctype = t; - if (t==PT_LIFE && v<NGOLALT) parts[pmap[y][x]>>8].tmp = v; + if (t==PT_LIFE && v<NGOLALT && (pmap[y][x]&0xFF)!=PT_STOR) parts[pmap[y][x]>>8].tmp = v; } return -1; } |