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

photon heating/cooling

Browse Source
This commit is contained in:
jacob1 2012-08-07 22:05:31 -04:00 committed by jacksonmj
parent f568bf2135
commit d9cba09363
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/powder.c
View File

@ -755,12 +755,15 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
if (t==SPC_HEAT||t==SPC_COOL) if (t==SPC_HEAT||t==SPC_COOL)
{ {
if ((pmap[y][x]&0xFF)!=PT_NONE&&(pmap[y][x]&0xFF)<PT_NUM) int r = pmap[y][x];
if (!(r&0xFF))
r = photons[y][x];
if ((r&0xFF)!=PT_NONE&&(r&0xFF)<PT_NUM)
{ {
if (t==SPC_HEAT&&parts[pmap[y][x]>>8].temp<MAX_TEMP) if (t==SPC_HEAT&&parts[r>>8].temp<MAX_TEMP)
{ {
float heatchange; float heatchange;
int r = pmap[y][x], fast = ((sdl_mod & (KMOD_SHIFT)) && (sdl_mod & (KMOD_CTRL))); int fast = ((sdl_mod & (KMOD_SHIFT)) && (sdl_mod & (KMOD_CTRL)));
if ((r&0xFF)==PT_PUMP || (r&0xFF)==PT_GPMP) if ((r&0xFF)==PT_PUMP || (r&0xFF)==PT_GPMP)
heatchange = fast?1.0f:.1f; heatchange = fast?1.0f:.1f;
else else
@ -768,10 +771,10 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
parts[r>>8].temp = restrict_flt(parts[r>>8].temp + heatchange, MIN_TEMP, MAX_TEMP); parts[r>>8].temp = restrict_flt(parts[r>>8].temp + heatchange, MIN_TEMP, MAX_TEMP);
} }
if (t==SPC_COOL&&parts[pmap[y][x]>>8].temp>MIN_TEMP) if (t==SPC_COOL&&parts[r>>8].temp>MIN_TEMP)
{ {
float heatchange; float heatchange;
int r = pmap[y][x], fast = ((sdl_mod & (KMOD_SHIFT)) && (sdl_mod & (KMOD_CTRL))); int fast = ((sdl_mod & (KMOD_SHIFT)) && (sdl_mod & (KMOD_CTRL)));
if ((r&0xFF)==PT_PUMP || (r&0xFF)==PT_GPMP) if ((r&0xFF)==PT_PUMP || (r&0xFF)==PT_GPMP)
heatchange = fast?1.0f:.1f; heatchange = fast?1.0f:.1f;
else else
@ -779,7 +782,7 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
parts[r>>8].temp = restrict_flt(parts[r>>8].temp - heatchange, MIN_TEMP, MAX_TEMP); parts[r>>8].temp = restrict_flt(parts[r>>8].temp - heatchange, MIN_TEMP, MAX_TEMP);
} }
return pmap[y][x]>>8; return r>>8;
} }
else else
{ {