diff options
| author | Cracker64 <cracker642@gmail.com> | 2010-12-26 14:47:25 (GMT) |
|---|---|---|
| committer | Cracker64 <cracker642@gmail.com> | 2010-12-26 14:47:25 (GMT) |
| commit | c5c88529c228987897b722cffafad4e888604132 (patch) | |
| tree | fa852d13377f404284344fc9e747f6027cbd53ef /src | |
| parent | 0dbb53606bca11d98cef874ff3c117c980e2b909 (diff) | |
| download | powder-c5c88529c228987897b722cffafad4e888604132.zip powder-c5c88529c228987897b722cffafad4e888604132.tar.gz | |
slight temp loading change so PUMP will load with 0C if saved at 0C. fix visual studio compiling
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/powder.c | 11 |
2 files changed, 7 insertions, 6 deletions
@@ -729,7 +729,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0) if(new_format) { ttv = (d[p++])<<8; ttv |= (d[p++]); - parts[i-1].temp = ttv; + parts[i-1].temp = ttv + 0.15; } else { parts[i-1].temp = (d[p++]*((MAX_TEMP+(-MIN_TEMP))/255))+MIN_TEMP; } diff --git a/src/powder.c b/src/powder.c index aabe04f..ce3c4fa 100644 --- a/src/powder.c +++ b/src/powder.c @@ -2794,6 +2794,7 @@ void update_particles_i(pixel *vid, int start, int inc) } else if(t==PT_BOMB) { + int nb; if(parts[i].tmp==1){ for(nx=-2; nx<3; nx++) for(ny=-2; ny<3; ny++) @@ -2823,7 +2824,7 @@ void update_particles_i(pixel *vid, int start, int inc) for(nxj=-(rad+1); nxj<=(rad+1); nxj++) for(nxi=-(rad+1); nxi<=(rad+1); nxi++) if((pow(nxi,2))/(pow((rad+1),2))+(pow(nxj,2))/(pow((rad+1),2))<=1){ - int nb = create_part(-1, x+nxi, y+nxj, PT_BOMB); + nb = create_part(-1, x+nxi, y+nxj, PT_BOMB); if(nb!=-1){ parts[nb].tmp = 1; parts[nb].life = 50; @@ -2838,7 +2839,7 @@ void update_particles_i(pixel *vid, int start, int inc) if((pmap[y+nxj][x+nxi]&0xFF)!=PT_DMND && (pmap[y+nxj][x+nxi]&0xFF)!=PT_CLNE && (pmap[y+nxj][x+nxi]&0xFF)!=PT_PCLN && (pmap[y+nxj][x+nxi]&0xFF)!=PT_BCLN){ delete_part(x+nxi, y+nxj); pv[(y+nxj)/CELL][(x+nxi)/CELL] += 0.1f; - int nb = create_part(-1, x+nxi, y+nxj, PT_BOMB); + nb = create_part(-1, x+nxi, y+nxj, PT_BOMB); if(nb!=-1){ parts[nb].tmp = 2; parts[nb].life = 2; @@ -3119,10 +3120,10 @@ void update_particles_i(pixel *vid, int start, int inc) r = pmap[y+ny][x+nx]; if((r>>8)>=NPART || !r) continue; - else if(parts[r>>8].type==PT_SPRK&&(parts[r>>8].ctype==PT_PSCN)&&(parts[r>>8].life>=3)&&parts[i].life%4==0&&parts_avg(i,r>>8,PT_INSL)!=PT_INSL) + else if(parts[r>>8].type==PT_SPRK&&(parts[r>>8].ctype==PT_PSCN)&&(parts[r>>8].life>=3)&&parts[i].life==0&&parts_avg(i,r>>8,PT_INSL)!=PT_INSL) { - flood_parts(x,y,PT_SPRK,PT_INST,-1);//add life - parts[r>>8].type==parts[r>>8].ctype; + flood_parts(x,y,PT_SPRK,PT_INST,-1);//spark the wire + //parts[r>>8].type=parts[r>>8].ctype; } } } |