diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-11-18 22:20:05 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-11-18 22:20:05 (GMT) |
| commit | 0ed3ca771e434f0dd041c4377d4a35c0c977adf1 (patch) | |
| tree | c54949df66ef45f0469c4489188b6e6d9c1970b8 | |
| parent | dfc41830152e7db8a64f4ad419cb07fe1c18d2b0 (diff) | |
| download | powder-0ed3ca771e434f0dd041c4377d4a35c0c977adf1.zip powder-0ed3ca771e434f0dd041c4377d4a35c0c977adf1.tar.gz | |
Bomb effects to effects render and sprk glow moved to fire
| -rw-r--r-- | includes/powdergraphics.h | 4 | ||||
| -rw-r--r-- | src/elements/sprk.c | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/includes/powdergraphics.h b/includes/powdergraphics.h index 223c00d..a880e71 100644 --- a/includes/powdergraphics.h +++ b/includes/powdergraphics.h @@ -26,9 +26,9 @@ #define EFFECT_GRAVIN 0x01000000 #define EFFECT_GRAVOUT 0x02000000 -#define RENDER_EFFE OPTIONS | PSPEC_STICKMAN | EFFECT +#define RENDER_EFFE OPTIONS | PSPEC_STICKMAN | EFFECT | PMODE_SPARK | PMODE_FLARE | PMODE_LFLARE #define RENDER_FIRE OPTIONS | PSPEC_STICKMAN | PMODE_FLAT | PMODE_ADD | PMODE_BLEND | FIREMODE -#define RENDER_GLOW OPTIONS | PSPEC_STICKMAN | PMODE_FLAT | PMODE_GLOW | PMODE_SPARK | PMODE_FLARE | PMODE_LFLARE | PMODE_ADD | PMODE_BLEND +#define RENDER_GLOW OPTIONS | PSPEC_STICKMAN | PMODE_FLAT | PMODE_GLOW | PMODE_ADD | PMODE_BLEND #define RENDER_BLUR OPTIONS | PSPEC_STICKMAN | PMODE_FLAT | PMODE_BLUR | PMODE_ADD | PMODE_BLEND #define RENDER_BLOB OPTIONS | PSPEC_STICKMAN | PMODE_FLAT | PMODE_BLOB | PMODE_ADD | PMODE_BLEND #define RENDER_BASC OPTIONS | PSPEC_STICKMAN | PMODE_FLAT | PMODE_ADD | PMODE_BLEND diff --git a/src/elements/sprk.c b/src/elements/sprk.c index 623ecb7..c0ded2d 100644 --- a/src/elements/sprk.c +++ b/src/elements/sprk.c @@ -219,14 +219,12 @@ int update_SPRK(UPDATE_FUNC_ARGS) { int graphics_SPRK(GRAPHICS_FUNC_ARGS) { - //*firea = 80; - //*firer = *colr*0.5; - //*fireg = *colg; - //*fireb = *colb*2; - *colr = 170; - *colg = 200; - *colb = 220; + *firea = 80; + + *firer = *colr = 170; + *fireg = *colg = 200; + *fireb = *colb = 220; //*pixel_mode |= FIRE_ADD; - *pixel_mode |= PMODE_GLOW; + *pixel_mode |= FIRE_ADD; return 1; } |