mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-31 11:41:51 +02:00
Code Issues Projects Releases Wiki Activity

slight temp loading change so PUMP will load with 0C if saved at 0C. fix visual studio compiling

Browse Source
This commit is contained in:
Cracker64
2010-12-26 09:47:25 -05:00
parent 0dbb53606b
commit c5c88529c2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@@ -729,7 +729,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0)
if(new_format) { if(new_format) {
ttv = (d[p++])<<8; ttv = (d[p++])<<8;
ttv |= (d[p++]); ttv |= (d[p++]);
parts[i-1].temp = ttv; parts[i-1].temp = ttv + 0.15;
} else { } else {
parts[i-1].temp = (d[p++]*((MAX_TEMP+(-MIN_TEMP))/255))+MIN_TEMP; parts[i-1].temp = (d[p++]*((MAX_TEMP+(-MIN_TEMP))/255))+MIN_TEMP;
} }

11
src/powder.c
View File

@@ -2794,6 +2794,7 @@ void update_particles_i(pixel *vid, int start, int inc)
} }
else if(t==PT_BOMB) else if(t==PT_BOMB)
{ {
int nb;
if(parts[i].tmp==1){ if(parts[i].tmp==1){
for(nx=-2; nx<3; nx++) for(nx=-2; nx<3; nx++)
for(ny=-2; ny<3; ny++) 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(nxj=-(rad+1); nxj<=(rad+1); nxj++)
for(nxi=-(rad+1); nxi<=(rad+1); nxi++) for(nxi=-(rad+1); nxi<=(rad+1); nxi++)
if((pow(nxi,2))/(pow((rad+1),2))+(pow(nxj,2))/(pow((rad+1),2))<=1){ 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){ if(nb!=-1){
parts[nb].tmp = 1; parts[nb].tmp = 1;
parts[nb].life = 50; 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){ 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); delete_part(x+nxi, y+nxj);
pv[(y+nxj)/CELL][(x+nxi)/CELL] += 0.1f; 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){ if(nb!=-1){
parts[nb].tmp = 2; parts[nb].tmp = 2;
parts[nb].life = 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]; r = pmap[y+ny][x+nx];
if((r>>8)>=NPART || !r) if((r>>8)>=NPART || !r)
continue; 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 flood_parts(x,y,PT_SPRK,PT_INST,-1);//spark the wire
parts[r>>8].type==parts[r>>8].ctype; //parts[r>>8].type=parts[r>>8].ctype;
} }
} }
} }