summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-08-19 11:28:09 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-08-19 11:28:09 (GMT)
commita94d249977614abe3dc94a31934ddf9cad989cd9 (patch)
treedf141572bf6360710446efb8800b5e440f813848 /src
parent961a393c7a20166277c10aebde43e7563951773a (diff)
downloadpowder-a94d249977614abe3dc94a31934ddf9cad989cd9.zip
powder-a94d249977614abe3dc94a31934ddf9cad989cd9.tar.gz
Fix save loading (enable replace mode) from the commandline, a bit of cleanup in main()
Diffstat (limited to 'src')
-rw-r--r--src/main.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/main.c b/src/main.c
index f8a7114..823be5e 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);