From a94d249977614abe3dc94a31934ddf9cad989cd9 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Fri, 19 Aug 2011 12:28:09 +0100
Subject: [PATCH] Fix save loading (enable replace mode) from the commandline,
 a bit of cleanup in main()

---
 src/main.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main.c b/src/main.c
index f8a71142b..823be5ee4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1728,8 +1728,6 @@ int main(int argc, char *argv[])
 		pyready = 0;
 		pygood = 0;
 	}
-#else
-	printf("python console disabled at compile time.\n");
 #endif
 
 #ifdef MT
@@ -1805,8 +1803,9 @@ int main(int argc, char *argv[])
 			if (file_data)
 			{
 				it=0;
-				parse_save(file_data, size, 0, 0, 0, bmap, fvx, fvy, signs, parts, pmap);
+				parse_save(file_data, size, 1, 0, 0, bmap, fvx, fvy, signs, parts, pmap);
 			}
+			i++;
 		}
 
 	}
@@ -1814,7 +1813,7 @@ int main(int argc, char *argv[])
 	save_presets(0);
 
 	make_kernel();
-	prepare_alpha(4, 1.0f);
+	prepare_alpha(CELL, 1.0f);
 
 	stamp_init();
 
@@ -1827,11 +1826,7 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-#ifdef BETA
 	http_ver_check = http_async_req_start(NULL, "http://" SERVER "/Update.api?Action=CheckVersion", NULL, 0, 0);
-#else
-	http_ver_check = http_async_req_start(NULL, "http://" SERVER "/Update.api?Action=CheckVersion", NULL, 0, 0);
-#endif
 	if (svf_login) {
 		http_session_check = http_async_req_start(NULL, "http://" SERVER "/Login.api?Action=CheckSession", NULL, 0, 0);
 		http_auth_headers(http_session_check, svf_user_id, NULL, svf_session_id);