diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-01-14 17:46:38 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-25 13:31:05 (GMT) |
| commit | 16ea042bab854bbb1b0d97621ed93af1744488c5 (patch) | |
| tree | a752f40c1d9b659180a6f6245bf94c91657dfeb1 /includes | |
| parent | 15310d01655a42e9c94a0aecd4f96edfb76a2301 (diff) | |
| download | powder-16ea042bab854bbb1b0d97621ed93af1744488c5.zip powder-16ea042bab854bbb1b0d97621ed93af1744488c5.tar.gz | |
Make transform_save work with new save functions
Conflicts:
src/powder.c
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/powder.h | 2 | ||||
| -rw-r--r-- | includes/save.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/powder.h b/includes/powder.h index 1e727d3..62a0c84 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -791,8 +791,6 @@ int create_parts(int x, int y, int rx, int ry, int c, int flags); void create_line(int x1, int y1, int x2, int y2, int rx, int ry, int c, int flags); -void *transform_save(void *odata, int *size, matrix2d transform, vector2d translate); - void orbitalparts_get(int block1, int block2, int resblock1[], int resblock2[]); void orbitalparts_set(int *block1, int *block2, int resblock1[], int resblock2[]); diff --git a/includes/save.h b/includes/save.h index a9645a0..e81b766 100644 --- a/includes/save.h +++ b/includes/save.h @@ -1,6 +1,8 @@ #ifndef SAVE_H #define SAVE_H +void *transform_save(void *odata, int *size, matrix2d transform, vector2d translate); + void *build_thumb(int *size, int bzip2); pixel *prerender_save(void *save, int size, int *width, int *height); @@ -22,4 +24,4 @@ void *build_save_PSv(int *size, int orig_x0, int orig_y0, int orig_w, int orig_h int parse_save_PSv(void *save, int size, int replace, int x0, int y0, unsigned char bmap[YRES/CELL][XRES/CELL], float fvx[YRES/CELL][XRES/CELL], float fvy[YRES/CELL][XRES/CELL], sign signs[MAXSIGNS], void* partsptr, unsigned pmap[YRES][XRES]); -#endif
\ No newline at end of file +#endif |