diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-25 10:31:21 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-25 10:31:21 (GMT) |
| commit | 07a1f21df484a252d54c82262ade6d4117425694 (patch) | |
| tree | 80df86661553807159f7fda3fbf2506d5df3b5fa /includes/graphics.h | |
| parent | f01056ee0249ad01ed24824aea39f05083110cd6 (diff) | |
| parent | f8d54e66dba5d8448d30f61f84883b4e7e6e1087 (diff) | |
| download | powder-07a1f21df484a252d54c82262ade6d4117425694.zip powder-07a1f21df484a252d54c82262ade6d4117425694.tar.gz | |
Merge latest with graphicstest
Diffstat (limited to 'includes/graphics.h')
| -rw-r--r-- | includes/graphics.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/includes/graphics.h b/includes/graphics.h index b62279d..57d2358 100644 --- a/includes/graphics.h +++ b/includes/graphics.h @@ -43,6 +43,8 @@ #endif #endif +extern int emp_decor; + extern unsigned cmode; extern SDL_Surface *sdl_scrn; extern int sdl_scale; @@ -57,16 +59,15 @@ extern unsigned char fire_g[YRES/CELL][XRES/CELL]; extern unsigned char fire_b[YRES/CELL][XRES/CELL]; extern unsigned int fire_alpha[CELL*3][CELL*3]; -extern pixel *fire_bg; extern pixel *pers_bg; extern char * flm_data; -extern int flm_data_points;; +extern int flm_data_points; extern pixel flm_data_colours[]; extern float flm_data_pos[]; extern char * plasma_data; -extern int plasma_data_points;; +extern int plasma_data_points; extern pixel plasma_data_colours[]; extern float plasma_data_pos[]; @@ -87,6 +88,8 @@ void prepare_graphicscache(); char * generate_gradient(pixel * colours, float * points, int pointcount, int size); +void draw_other(pixel *vid); + void draw_rgba_image(pixel *vid, unsigned char *data, int x, int y, float a); void *ptif_pack(pixel *src, int w, int h, int *result_size); |