Restore cracker64 changes overwritten by merge

1 files changed, 27 insertions, 16 deletions

diff --git a/src/main.c b/src/main.c
index 68c1140..46267c2 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;
 				}
@@ -1495,13 +1499,25 @@ int main(int argc, char *argv[])
 		if (sdl_key=='=')
 		{
 			int nx, ny;
-			for (nx = 0; nx<XRES/CELL; nx++)
-				for (ny = 0; ny<YRES/CELL; ny++)
-				{
-					pv[ny][nx] = 0;
-					vx[ny][nx] = 0;
-					vy[ny][nx] = 0;
-				}
+			if(sdl_mod & (KMOD_CTRL))
+			{
+				for(i=0; i<NPART; i++)
+					if(parts[i].type==PT_SPRK)
+					{
+						parts[i].type = parts[i].ctype;
+						parts[i].life = 0;
+					}
+			}
+			else
+			{
+				for (nx = 0; nx<XRES/CELL; nx++)
+					for (ny = 0; ny<YRES/CELL; ny++)
+					{
+						pv[ny][nx] = 0;
+						vx[ny][nx] = 0;
+						vy[ny][nx] = 0;
+					}
+			}
 		}
 
 		if (sdl_key=='w' && (!isplayer2 || (sdl_mod & (KMOD_SHIFT)))) //Gravity, by Moach
@@ -2036,7 +2052,6 @@ int main(int argc, char *argv[])
 						memset(bmap, 0, sizeof(bmap));
 						memset(emap, 0, sizeof(emap));
 						memset(parts, 0, sizeof(particle)*NPART);
-						
 						memset(photons, 0, sizeof(photons));
 						memset(wireless, 0, sizeof(wireless));
 						memset(gol2, 0, sizeof(gol2));
@@ -2098,10 +2113,6 @@ int main(int argc, char *argv[])
 					if (x>=19 && x<=35 && svf_last && svf_open && !bq) {
 						//int tpval = sys_pause;
 						parse_save(svf_last, svf_lsize, 1, 0, 0);
-						for (j= 0; j<99; j++) { //reset wifi on reload
-							wireless[j][0] = 0;
-							wireless[j][1] = 0;
-						}
 						//sys_pause = tpval;
 					}
 					if (x>=(XRES+BARSIZE-(510-476)) && x<=(XRES+BARSIZE-(510-491)) && !bq)