diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-28 22:48:57 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-28 22:48:57 (GMT) |
| commit | e46f26684bfbe82734ad4716e45ebb1a94075a69 (patch) | |
| tree | 29c0f6f38916ff94f026ac7c18dbd54d67fcbd24 /includes | |
| parent | 7413654b9f1d6c0cde622d1b3129378a8e6c30d2 (diff) | |
| download | powder-e46f26684bfbe82734ad4716e45ebb1a94075a69.zip powder-e46f26684bfbe82734ad4716e45ebb1a94075a69.tar.gz | |
Fix Life and heat display, implement alpha, blend and add, fix FILT, INVS and BRAY + others
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/graphics.h | 2 | ||||
| -rw-r--r-- | includes/powder.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/graphics.h b/includes/graphics.h index 57d2358..de61e47 100644 --- a/includes/graphics.h +++ b/includes/graphics.h @@ -75,7 +75,7 @@ struct gcache_item { int isready; int pixel_mode; - int colr, colg, colb; + int cola, colr, colg, colb; int firea, firer, fireg, fireb; }; typedef struct gcache_item gcache_item; diff --git a/includes/powder.h b/includes/powder.h index 9baf359..216ba9f 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -246,8 +246,8 @@ #define FLAG_STAGNANT 1 -#define GRAPHICS_FUNC_ARGS particle *cpart, int nx, int ny, int *pixel_mode, int *colr, int *colg, int *colb, int *firea, int *firer, int *fireg, int *fireb -#define GRAPHICS_FUNC_SUBCALL_ARGS cpart, nx, ny, pixel_mode, colr, colg, colb, firea, firer, fireg, fireb +#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 |