summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-01-30 21:46:50 (GMT)
committer Cracker64 <cracker642@gmail.com>2011-01-30 21:46:50 (GMT)
commit8ed2947b4cbfbe21b9ba30961c469823f2e285ee (patch)
tree24ee9b111014b1df89d3b999f88037d452c9f3ec /src/main.c
parentfcf958da21621887a80249f2af863991544815fd (diff)
downloadpowder-8ed2947b4cbfbe21b9ba30961c469823f2e285ee.zip
powder-8ed2947b4cbfbe21b9ba30961c469823f2e285ee.tar.gz
update with latest
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c
index 6f7ee7b..e6f29b4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -492,6 +492,10 @@ int parse_save(void *save, int size, int replace, int x0, int y0)
memset(vx, 0, sizeof(vx));
memset(vy, 0, sizeof(vy));
memset(pv, 0, sizeof(pv));
+ memset(photons, 0, sizeof(photons));
+ memset(wireless, 0, sizeof(wireless));
+ memset(gol2, 0, sizeof(gol2));
+ memset(portal, 0, sizeof(portal));
death = death2 = ISSPAWN1 = ISSPAWN2 = 0;
}
@@ -714,10 +718,10 @@ int parse_save(void *save, int size, int replace, int x0, int y0)
ttv |= (d[p++]);
parts[i-1].tmp = ttv;
if(ptypes[parts[i-1].type].properties&PROP_LIFE && !parts[i-1].tmp)
- for(q = 1; q<NGOL ; q++){
- if(parts[i-1].type==goltype[q-1] && grule[q][9]==2)
- parts[i-1].tmp = grule[q][9]-1;
- }
+ for(q = 1; q<NGOL ; q++) {
+ if(parts[i-1].type==goltype[q-1] && grule[q][9]==2)
+ parts[i-1].tmp = grule[q][9]-1;
+ }
} else {
p+=2;
}
@@ -1509,7 +1513,7 @@ int main(int argc, char *argv[])
parts[i].type = parts[i].ctype;
parts[i].life = 0;
}
- }
+ }
else
{
for (nx = 0; nx<XRES/CELL; nx++)