diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-06-20 20:45:33 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-06-20 21:15:45 (GMT) |
| commit | 1d5b08194291db72c05e68eed592e8fcb6101c63 (patch) | |
| tree | 39945df4b183ef2bbcaf0cc1432a3a02b547f5f6 /src/elements/newgraphics.c | |
| parent | 9b2c2a78a6f4ba4fb13f04f17a649caeaf416d8d (diff) | |
| download | powder-1d5b08194291db72c05e68eed592e8fcb6101c63.zip powder-1d5b08194291db72c05e68eed592e8fcb6101c63.tar.gz | |
Replace all explosion sparks with new element (EMBR)
Replaces: BOMB sparks and flash, electrons + glass sparks, sparks from
IGNC, sparks from TNT explosion, and sparks from FWRK and FIRW.
Diffstat (limited to 'src/elements/newgraphics.c')
| -rw-r--r-- | src/elements/newgraphics.c | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/src/elements/newgraphics.c b/src/elements/newgraphics.c index 946afc8..c8581f6 100644 --- a/src/elements/newgraphics.c +++ b/src/elements/newgraphics.c @@ -117,29 +117,6 @@ int graphics_LIFE(GRAPHICS_FUNC_ARGS) *colb = PIXB(pc); return 0; } -int graphics_DUST(GRAPHICS_FUNC_ARGS) -{ - if(cpart->life >= 1) - { - *firea = 120; - *firer = *colr = cpart->tmp2; - *fireg = *colg = cpart->tmp; - *fireb = *colb = cpart->ctype; - if (decorations_enable && cpart->dcolour) - { - int a = (cpart->dcolour>>24)&0xFF; - *firer = *colr = (a*((cpart->dcolour>>16)&0xFF) + (255-a)**colr) >> 8; - *fireg = *colg = (a*((cpart->dcolour>>8)&0xFF) + (255-a)**colg) >> 8; - *fireb = *colb = (a*((cpart->dcolour)&0xFF) + (255-a)**colb) >> 8; - } - *pixel_mode |= PMODE_GLOW | FIRE_ADD; - /**firea = 255; - *firer = *colr; - *fireg = *colg; - *fireb = *colb;*/ - } - return 0; -} int graphics_GRAV(GRAPHICS_FUNC_ARGS) { *colr = 20; @@ -497,33 +474,7 @@ int graphics_HFLM(GRAPHICS_FUNC_ARGS) } int graphics_FIRW(GRAPHICS_FUNC_ARGS) { - if(cpart->tmp>=3) - { - int caddress = restrict_flt(restrict_flt((float)(cpart->tmp-4), 0.0f, 200.0f)*3, 0.0f, (200.0f*3)-3); - *colr = (unsigned char)firw_data[caddress]; - *colg = (unsigned char)firw_data[caddress+1]; - *colb = (unsigned char)firw_data[caddress+2]; - - if (decorations_enable && cpart->dcolour) - { - int a = (cpart->dcolour>>24)&0xFF; - *colr = (a*((cpart->dcolour>>16)&0xFF) + (255-a)**colr) >> 8; - *colg = (a*((cpart->dcolour>>8)&0xFF) + (255-a)**colg) >> 8; - *colb = (a*((cpart->dcolour)&0xFF) + (255-a)**colb) >> 8; - } - - *firea = cpart->life*4; - if(*firea > 240) - *firea = 240; - *firer = *colr; - *fireg = *colg; - *fireb = *colb; - - *pixel_mode = PMODE_NONE; //Clear default, don't draw pixel - *pixel_mode |= FIRE_ADD; - //Returning 0 means dynamic, do not cache - } - else if(cpart->tmp > 0) + if(cpart->tmp > 0) { *pixel_mode |= PMODE_GLOW; } |
