diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-05-28 20:01:31 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-05-29 12:34:37 (GMT) |
| commit | 6a2f357efd2dac87a4a9f30206717500440d2a76 (patch) | |
| tree | 63df6d88119ac8fd0356268e007240e679cdbf57 /includes | |
| parent | a40d1dc12122a757a14743da766bed812856dfc3 (diff) | |
| download | powder-6a2f357efd2dac87a4a9f30206717500440d2a76.zip powder-6a2f357efd2dac87a4a9f30206717500440d2a76.tar.gz | |
Revert "Pass decorations to saving functions (doesn't actually save yet)"
This reverts commit 7fe99f32102429113c671615fc2c5cadb9c51e56.
Conflicts:
src/main.c
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/defines.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/defines.h b/includes/defines.h index 3e6a6b3..2194159 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -187,7 +187,7 @@ extern int sys_pause; extern int sys_shortcuts; extern int legacy_enable; //Used to disable new features such as heat, will be set by commandline or save. extern int death, death2, framerender; -extern pixel *vid_buf, *decorations; +extern pixel *vid_buf; extern unsigned char last_major, last_minor, update_flag; @@ -198,8 +198,8 @@ void thumb_cache_inval(char *id); void thumb_cache_add(char *id, void *thumb, int size); int thumb_cache_find(char *id, void **thumb, int *size); void *build_thumb(int *size, int bzip2); -void *build_save(int *size, int x0, int y0, int w, int h, unsigned char bmap[YRES/CELL][XRES/CELL], float fvx[YRES/CELL][XRES/CELL], float fvy[YRES/CELL][XRES/CELL], sign signs[MAXSIGNS], void* partsptr, pixel *decorations); -int parse_save(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], pixel *decorations); +void *build_save(int *size, int x0, int y0, int w, int h, unsigned char bmap[YRES/CELL][XRES/CELL], float fvx[YRES/CELL][XRES/CELL], float fvy[YRES/CELL][XRES/CELL], sign signs[MAXSIGNS], void* partsptr); +int parse_save(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]); void clear_sim(void); void del_stamp(int d); void sdl_seticon(void); |