diff options
| author | Simon <simon@hardwired.org.uk> | 2010-10-05 16:56:09 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2010-10-05 16:56:09 (GMT) |
| commit | 8b55113abc319c51d85fd01021f0052ce4f7b8d0 (patch) | |
| tree | a9188b254e3ea3acfd771556d8e02808293209a3 /src | |
| parent | f2fbd1728fa90a4e42e1f5e4f12de4a16a52b9d1 (diff) | |
| download | powder-8b55113abc319c51d85fd01021f0052ce4f7b8d0.zip powder-8b55113abc319c51d85fd01021f0052ce4f7b8d0.tar.gz | |
Some more fire improvements
Diffstat (limited to 'src')
| -rw-r--r-- | src/graphics.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/graphics.c b/src/graphics.c index 2c9a686..cf0e1e6 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1883,7 +1883,7 @@ void draw_parts(pixel *vid) } else if(t==PT_FIRE && parts[i].life) { - float ttemp = (float)parts[i].life; + float ttemp = (float)((int)(parts[i].life/2)); int caddress = restrict_flt(restrict_flt(ttemp, 0.0f, 200.0f)*3, 0.0f, (200.0f*3)-3); uint8 R = flm_data[caddress]; uint8 G = flm_data[caddress+1]; @@ -1907,18 +1907,21 @@ void draw_parts(pixel *vid) } else { - cr = R; - cg = G; - cb = B; - blendpixel(vid, nx, ny, cr, cg, cb, 192); - blendpixel(vid, nx+1, ny, cr, cg, cb, 96); - blendpixel(vid, nx-1, ny, cr, cg, cb, 96); - blendpixel(vid, nx, ny+1, cr, cg, cb, 96); - blendpixel(vid, nx, ny-1, cr, cg, cb, 96); - blendpixel(vid, nx+1, ny-1, cr, cg, cb, 32); - blendpixel(vid, nx-1, ny+1, cr, cg, cb, 32); - blendpixel(vid, nx+1, ny+1, cr, cg, cb, 32); - blendpixel(vid, nx-1, ny-1, cr, cg, cb, 32); + cr = parts[i].life * 8; + cg = parts[i].life * 2; + cb = parts[i].life; + if(cr>255) cr = 255; + if(cg>192) cg = 212; + if(cb>128) cb = 192; + blendpixel(vid, nx, ny, cr, cg, cb, 255); + blendpixel(vid, nx+1, ny, cr, cg, cb, 96); + blendpixel(vid, nx-1, ny, cr, cg, cb, 96); + blendpixel(vid, nx, ny+1, cr, cg, cb, 96); + blendpixel(vid, nx, ny-1, cr, cg, cb, 96); + blendpixel(vid, nx+1, ny-1, cr, cg, cb, 32); + blendpixel(vid, nx-1, ny+1, cr, cg, cb, 32); + blendpixel(vid, nx+1, ny+1, cr, cg, cb, 32); + blendpixel(vid, nx-1, ny-1, cr, cg, cb, 32); } // Older Code /*if(cmode == 3||cmode==4 || cmode==6) |