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 /src/interface.c | |
| 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 'src/interface.c')
| -rw-r--r-- | src/interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interface.c b/src/interface.c index 65d80dc..c501ddd 100644 --- a/src/interface.c +++ b/src/interface.c @@ -3375,7 +3375,7 @@ int open_ui(pixel *vid_buf, char *save_id, char *save_date) if (queue_open) { if (info_ready && data_ready) { // Do Open! - status = parse_save(data, data_size, 1, 0, 0, bmap, fvx, fvy, signs, parts, pmap, decorations); + status = parse_save(data, data_size, 1, 0, 0, bmap, fvx, fvy, signs, parts, pmap); if (!status) { //if(svf_last) //free(svf_last); @@ -3896,7 +3896,7 @@ void execute_save(pixel *vid_buf) plens[0] = strlen(svf_name); uploadparts[1] = svf_description; plens[1] = strlen(svf_description); - uploadparts[2] = build_save(plens+2, 0, 0, XRES, YRES, bmap, fvx, fvy, signs, parts, decorations); + uploadparts[2] = build_save(plens+2, 0, 0, XRES, YRES, bmap, fvx, fvy, signs, parts); uploadparts[3] = build_thumb(plens+3, 1); uploadparts[4] = (svf_publish==1)?"Public":"Private"; plens[4] = strlen((svf_publish==1)?"Public":"Private"); |