summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2011-05-11 21:02:15 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-05-14 12:44:02 (GMT)
commit7fe99f32102429113c671615fc2c5cadb9c51e56 (patch)
treea6b6fa9e9510b9e6ae9d3d838524dee9e1a9ef00 /includes
parentcbfc73d8d60421c5d64a8cca0961c87bc33146d0 (diff)
downloadpowder-7fe99f32102429113c671615fc2c5cadb9c51e56.zip
powder-7fe99f32102429113c671615fc2c5cadb9c51e56.tar.gz
Pass decorations to saving functions (doesn't actually save yet)
Diffstat (limited to 'includes')
-rw-r--r--includes/defines.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/defines.h b/includes/defines.h
index 93504f1..dc29b4c 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;
+extern pixel *vid_buf, *decorations;
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);
-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 *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 clear_sim(void);
void del_stamp(int d);
void sdl_seticon(void);