diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-17 21:34:17 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-17 21:34:17 (GMT) |
| commit | 4b073de82a77db344b728434ee9ed18f69a06b4e (patch) | |
| tree | 17a4f27f3c8f12a10f12d79442bb76e18e7f40ed /includes | |
| parent | 36de2f19f57ff056166ae268404f1f3851ea3077 (diff) | |
| download | powder-4b073de82a77db344b728434ee9ed18f69a06b4e.zip powder-4b073de82a77db344b728434ee9ed18f69a06b4e.tar.gz | |
Revert "Moved soap and stick men graphics things to special functions."
This reverts commit 7f5408f196002476c4765f1cae833e1441e4b276.
Conflicts:
includes/powder.h
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/powder.h | 4 | ||||
| -rw-r--r-- | includes/powdergraphics.h | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/includes/powder.h b/includes/powder.h index 411d537..a782e7c 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -275,8 +275,8 @@ #define FLAG_SKIPMOVE 0x2 // skip movement for one frame, only implemented for PHOT #define FLAG_MOVABLE 0x4 // if can move -#define GRAPHICS_FUNC_ARGS particle *cpart, int nx, int ny, int *pixel_mode, int* cola, int *colr, int *colg, int *colb, int *firea, int *firer, int *fireg, int *fireb, pixel *vid -#define GRAPHICS_FUNC_SUBCALL_ARGS cpart, nx, ny, pixel_mode, cola, colr, colg, colb, firea, firer, fireg, fireb, vid +#define GRAPHICS_FUNC_ARGS particle *cpart, int nx, int ny, int *pixel_mode, int* cola, int *colr, int *colg, int *colb, int *firea, int *firer, int *fireg, int *fireb +#define GRAPHICS_FUNC_SUBCALL_ARGS cpart, nx, ny, pixel_mode, cola, colr, colg, colb, firea, firer, fireg, fireb struct particle diff --git a/includes/powdergraphics.h b/includes/powdergraphics.h index 3684f2c..66286c6 100644 --- a/includes/powdergraphics.h +++ b/includes/powdergraphics.h @@ -28,6 +28,7 @@ #define PMODE_LFLARE 0x00000040 #define PMODE_ADD 0x00000080 #define PMODE_BLEND 0x00000100 +#define PSPEC_STICKMAN 0x00000200 #define OPTIONS 0x0000F000 #define NO_DECO 0x00001000 @@ -42,13 +43,13 @@ #define EFFECT_GRAVOUT 0x02000000 #define EFFECT_LINES 0x04000000 -#define RENDER_EFFE OPTIONS | EFFECT | PMODE_SPARK | PMODE_FLARE | PMODE_LFLARE -#define RENDER_FIRE OPTIONS | PMODE_FLAT | PMODE_ADD | PMODE_BLEND | FIREMODE -#define RENDER_GLOW OPTIONS | PMODE_FLAT | PMODE_GLOW | PMODE_ADD | PMODE_BLEND -#define RENDER_BLUR OPTIONS | PMODE_FLAT | PMODE_BLUR | PMODE_ADD | PMODE_BLEND -#define RENDER_BLOB OPTIONS | PMODE_FLAT | PMODE_BLOB | PMODE_ADD | PMODE_BLEND -#define RENDER_BASC OPTIONS | PMODE_FLAT | PMODE_ADD | PMODE_BLEND -#define RENDER_NONE OPTIONS | PMODE_FLAT +#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_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 +#define RENDER_NONE OPTIONS | PSPEC_STICKMAN | PMODE_FLAT #define COLOUR_HEAT 0x00000001 #define COLOUR_LIFE 0x00000002 |