matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix save loading (enable replace mode) from the commandline, a bit of cleanup in main()

Browse Source
This commit is contained in:
Simon Robertshaw 2011-08-19 12:28:09 +01:00
parent 961a393c7a
commit a94d249977
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.c
View File

@ -1728,8 +1728,6 @@ int main(int argc, char *argv[])
pyready = 0; pyready = 0;
pygood = 0; pygood = 0;
} }
#else
printf("python console disabled at compile time.\n");
#endif #endif
#ifdef MT #ifdef MT
@ -1805,8 +1803,9 @@ int main(int argc, char *argv[])
if (file_data) if (file_data)
{ {
it=0; 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); save_presets(0);
make_kernel(); make_kernel();
prepare_alpha(4, 1.0f); prepare_alpha(CELL, 1.0f);
stamp_init(); stamp_init();
@ -1827,11 +1826,7 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
#ifdef BETA
http_ver_check = http_async_req_start(NULL, "http://" SERVER "/Update.api?Action=CheckVersion", NULL, 0, 0); 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) { if (svf_login) {
http_session_check = http_async_req_start(NULL, "http://" SERVER "/Login.api?Action=CheckSession", NULL, 0, 0); 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); http_auth_headers(http_session_check, svf_user_id, NULL, svf_session_id);