From 1b9b1752a77ec0bd9c9d9b02a6a0103f1e7f8c21 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 23 Feb 2011 20:54:11 +0000 Subject: [PATCH] Switch life to ctype for, photons apparently use the GLOW ctype for something --- src/elements/glow.c | 2 +- src/graphics.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/elements/glow.c b/src/elements/glow.c index 0993e6166..d69223305 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 4b29dc700..cea2ba72a 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);