diff options
| author | Simon <simon@hardwired.org.uk> | 2011-07-13 11:03:30 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-07-13 11:03:30 (GMT) |
| commit | 0fbe6e2d3fbe045e0db233c27bacc3b370b08753 (patch) | |
| tree | 1a5a054503b012599f0c92a5926244150e9e5c91 | |
| parent | b4dd9ec05674f6af1932716cc3d280aa3cd8b68c (diff) | |
| download | powder-0fbe6e2d3fbe045e0db233c27bacc3b370b08753.zip powder-0fbe6e2d3fbe045e0db233c27bacc3b370b08753.tar.gz | |
Fix PBCN saving and increment major version
| -rw-r--r-- | includes/defines.h | 4 | ||||
| -rw-r--r-- | src/main.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/includes/defines.h b/includes/defines.h index 33845c2..95e0e00 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -7,8 +7,8 @@ #define PATH_SEP "/" #endif -#define SAVE_VERSION 51 -#define MINOR_VERSION 1 +#define SAVE_VERSION 52 +#define MINOR_VERSION 0 #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter. //#define BETA @@ -466,7 +466,7 @@ void *build_save(int *size, int x0, int y0, int w, int h, unsigned char bmap[YRE for (j=0; j<w*h; j++) { i = m[j]; - if (i && (parts[i-1].type==PT_CLNE || parts[i-1].type==PT_PCLN || parts[i-1].type==PT_BCLN || parts[i-1].type==PT_SPRK || parts[i-1].type==PT_LAVA || parts[i-1].type==PT_PIPE || parts[i-1].type==PT_LIFE)) + if (i && (parts[i-1].type==PT_CLNE || parts[i-1].type==PT_PCLN || parts[i-1].type==PT_BCLN || parts[i-1].type==PT_SPRK || parts[i-1].type==PT_LAVA || parts[i-1].type==PT_PIPE || parts[i-1].type==PT_LIFE || parts[i-1].type==PT_PBCN)) d[p++] = parts[i-1].ctype; } @@ -978,7 +978,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char int gnum = 0; i = m[j]; ty = d[pty+j]; - if (i && (ty==PT_CLNE || (ty==PT_PCLN && ver>=43) || (ty==PT_BCLN && ver>=44) || (ty==PT_SPRK && ver>=21) || (ty==PT_LAVA && ver>=34) || (ty==PT_PIPE && ver>=43) || (ty==PT_LIFE && ver>=51))) + if (i && (ty==PT_CLNE || (ty==PT_PCLN && ver>=43) || (ty==PT_BCLN && ver>=44) || (ty==PT_SPRK && ver>=21) || (ty==PT_LAVA && ver>=34) || (ty==PT_PIPE && ver>=43) || (ty==PT_LIFE && ver>=51) || (ty==PT_PBCN && ver>=52))) { if (p >= size) goto corrupt; |