diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-18 18:13:50 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-18 18:13:50 (GMT) |
| commit | f55fc54f6e704d53d633aa855e45aa9417ff176a (patch) | |
| tree | c8a86c01289a51495adc8066fc6a93b8cd2a7667 /src/elements/newgraphics.cpp | |
| parent | 95c702535cad90eb2e07c93b628888227ef9728a (diff) | |
| download | powder-f55fc54f6e704d53d633aa855e45aa9417ff176a.zip powder-f55fc54f6e704d53d633aa855e45aa9417ff176a.tar.gz | |
TPT: Fix firework glow 001c4502e8
Diffstat (limited to 'src/elements/newgraphics.cpp')
| -rw-r--r-- | src/elements/newgraphics.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/elements/newgraphics.cpp b/src/elements/newgraphics.cpp index 3b19ef2..db0cc72 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; |