From f55fc54f6e704d53d633aa855e45aa9417ff176a Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Wed, 18 Apr 2012 19:13:50 +0100 Subject: [PATCH] TPT: Fix firework glow 001c4502e8 --- src/elements/newgraphics.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/elements/newgraphics.cpp b/src/elements/newgraphics.cpp index 3b19ef29f..db0cc72cf 100644 --- a/src/elements/newgraphics.cpp +++ b/src/elements/newgraphics.cpp @@ -106,17 +106,18 @@ int graphics_DUST(GRAPHICS_FUNC_ARGS) { if(cpart->life >= 1) { - *colr = cpart->flags; - *colg = cpart->tmp; - *colb = cpart->ctype; + *firea = 120; + *firer = *colr = cpart->flags; + *fireg = *colg = cpart->tmp; + *fireb = *colb = cpart->ctype; if (ren->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; + *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; + *pixel_mode |= PMODE_GLOW | FIRE_ADD; /**firea = 255; *firer = *colr; *fireg = *colg;