summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-09-03 13:41:07 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-09-03 13:41:07 (GMT)
commit456a8df31ef16b7bc92ec683d4cffc0fb192eef4 (patch)
tree77df945a551833fc3f4530c6a69420f0a36ffc93 /src/main.c
parentea68100724fdb5acbb77ff18032b05d35c9eeecc (diff)
downloadpowder-456a8df31ef16b7bc92ec683d4cffc0fb192eef4.zip
powder-456a8df31ef16b7bc92ec683d4cffc0fb192eef4.tar.gz
Convert Element
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 398400e..d39569d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -479,7 +479,7 @@ void *build_save(int *size, int orig_x0, int orig_y0, int orig_w, int orig_h, un
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 || parts[i-1].type==PT_PBCN || parts[i-1].type==PT_WIRE || parts[i-1].type==PT_STOR))
+ 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 || parts[i-1].type==PT_WIRE || parts[i-1].type==PT_STOR || parts[i-1].type==PT_CONV))
d[p++] = parts[i-1].ctype;
}
@@ -963,7 +963,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) || (ty==PT_PBCN && ver>=52) || (ty==PT_WIRE && ver>=55) || (ty==PT_STOR && ver>=59)))
+ 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) || (ty==PT_WIRE && ver>=55) || (ty==PT_STOR && ver>=59) || (ty==PT_CONV && ver>=60)))
{
if (p >= size)
goto corrupt;