summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/elements/glow.c2
-rw-r--r--src/graphics.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/elements/glow.c b/src/elements/glow.c
index 0993e61..d692233 100644
--- a/src/elements/glow.c
+++ b/src/elements/glow.c
@@ -16,7 +16,7 @@ int update_GLOW(UPDATE_FUNC_ARGS) {
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));
//printf("%f %f\n", parts[i].vx, parts[i].vy);
diff --git a/src/graphics.c b/src/graphics.c
index 4b29dc7..cea2ba7 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -2371,11 +2371,11 @@ void draw_parts(pixel *vid)
else if (t==PT_GLOW)
{
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;
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);
vid[ny*(XRES+BARSIZE)+nx] = PIXRGB(cr, cg, cb);