matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bomb effects to effects render and sprk glow moved to fire

Browse Source
This commit is contained in:
Simon Robertshaw 2011-11-18 22:20:05 +00:00
parent dfc4183015
commit 0ed3ca771e
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/powdergraphics.h
View File

@ -26,9 +26,9 @@
#define EFFECT_GRAVIN 0x01000000 #define EFFECT_GRAVIN 0x01000000
#define EFFECT_GRAVOUT 0x02000000 #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_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_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_BLOB OPTIONS | PSPEC_STICKMAN | PMODE_FLAT | PMODE_BLOB | PMODE_ADD | PMODE_BLEND
#define RENDER_BASC OPTIONS | PSPEC_STICKMAN | PMODE_FLAT | PMODE_ADD | PMODE_BLEND #define RENDER_BASC OPTIONS | PSPEC_STICKMAN | PMODE_FLAT | PMODE_ADD | PMODE_BLEND

14
src/elements/sprk.c
View File

@ -219,14 +219,12 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
int graphics_SPRK(GRAPHICS_FUNC_ARGS) int graphics_SPRK(GRAPHICS_FUNC_ARGS)
{ {
//*firea = 80; *firea = 80;
//*firer = *colr*0.5;
//*fireg = *colg; *firer = *colr = 170;
//*fireb = *colb*2; *fireg = *colg = 200;
*colr = 170; *fireb = *colb = 220;
*colg = 200;
*colb = 220;
//*pixel_mode |= FIRE_ADD; //*pixel_mode |= FIRE_ADD;
*pixel_mode |= PMODE_GLOW; *pixel_mode |= FIRE_ADD;
return 1; return 1;
} }