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

Switch life to ctype for, photons apparently use the GLOW ctype for something

Browse Source
This commit is contained in:
Simon 2011-02-23 20:54:11 +00:00
parent 5d4d815ad3
commit 1b9b1752a7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/elements/glow.c
View File

@ -16,7 +16,7 @@ int update_GLOW(UPDATE_FUNC_ARGS) {
parts[r>>8].life = 10; parts[r>>8].life = 10;
} }
} }
parts[i].life = pv[y/CELL][x/CELL]*16; parts[i].ctype = pv[y/CELL][x/CELL]*16;
parts[i].tmp = abs((int)((vx[y/CELL][x/CELL]+vy[y/CELL][x/CELL])*16.0f)) + abs((int)((parts[i].vx+parts[i].vy)*64.0f)); parts[i].tmp = abs((int)((vx[y/CELL][x/CELL]+vy[y/CELL][x/CELL])*16.0f)) + abs((int)((parts[i].vx+parts[i].vy)*64.0f));
//printf("%f %f\n", parts[i].vx, parts[i].vy); //printf("%f %f\n", parts[i].vx, parts[i].vy);

4
src/graphics.c
View File

@ -2371,11 +2371,11 @@ void draw_parts(pixel *vid)
else if (t==PT_GLOW) else if (t==PT_GLOW)
{ {
fr = restrict_flt(parts[i].temp-(275.13f+32.0f), 0, 128)/50.0f; fr = restrict_flt(parts[i].temp-(275.13f+32.0f), 0, 128)/50.0f;
fg = restrict_flt(parts[i].life, 0, 128)/50.0f; fg = restrict_flt(parts[i].ctype, 0, 128)/50.0f;
fb = restrict_flt(parts[i].tmp, 0, 128)/50.0f; fb = restrict_flt(parts[i].tmp, 0, 128)/50.0f;
cr = restrict_flt(64.0f+parts[i].temp-(275.13f+32.0f), 0, 255); cr = restrict_flt(64.0f+parts[i].temp-(275.13f+32.0f), 0, 255);
cg = restrict_flt(64.0f+parts[i].life, 0, 255); cg = restrict_flt(64.0f+parts[i].ctype, 0, 255);
cb = restrict_flt(64.0f+parts[i].tmp, 0, 255); cb = restrict_flt(64.0f+parts[i].tmp, 0, 255);
vid[ny*(XRES+BARSIZE)+nx] = PIXRGB(cr, cg, cb); vid[ny*(XRES+BARSIZE)+nx] = PIXRGB(cr, cg, cb);