diff options
Diffstat (limited to 'src/engine/main.cpp')
| -rw-r--r-- | src/engine/main.cpp | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/src/engine/main.cpp b/src/engine/main.cpp index a059c13..5e3b1c8 100644 --- a/src/engine/main.cpp +++ b/src/engine/main.cpp @@ -21,7 +21,6 @@ void cleanup() { extern void clear_console(); clear_console(); extern void clear_mdls(); clear_mdls(); extern void clear_sound(); clear_sound(); - closelogfile(); SDL_Quit(); } @@ -899,59 +898,16 @@ int getclockmillis() { VAR(numcpus, 1, 1, 16); -int main(int argc, char **argv) { - setlogfile(NULL); +int main(void) { int dedicated = 0; char *load = NULL, *initscript = NULL; initing = INIT_RESET; - // set home dir first - for(int i = 1; i<argc; i++) if(argv[i][0]=='-' && argv[i][1] == 'q') { sethomedir(&argv[i][2]); break; } - // set log after home dir, but before anything else - for(int i = 1; i<argc; i++) if(argv[i][0]=='-' && argv[i][1] == 'g') { - const char *file = argv[i][2] ? &argv[i][2] : "log.txt"; - setlogfile(file); - logoutf("Setting log file: %s", file); - break; - } execfile("init.cfg", false); - for(int i = 1; i<argc; i++) { - if(argv[i][0]=='-') switch(argv[i][1]) { - case 'q': if(homedir[0]) logoutf("Using home directory: %s", homedir); break; - case 'r': /* compat, ignore */ break; - case 'k': { - const char *dir = addpackagedir(&argv[i][2]); - if(dir) logoutf("Adding package directory: %s", dir); - break; - } - case 'g': break; - case 'd': dedicated = atoi(&argv[i][2]); if(dedicated<=0) dedicated = 2; break; - case 'w': scr_w = clamp(atoi(&argv[i][2]), SCR_MINW, SCR_MAXW); if(!findarg(argc, argv, "-h")) scr_h = -1; break; - case 'h': scr_h = clamp(atoi(&argv[i][2]), SCR_MINH, SCR_MAXH); if(!findarg(argc, argv, "-w")) scr_w = -1; break; - case 'z': depthbits = atoi(&argv[i][2]); break; - case 'b': /* compat, ignore */ break; - case 'a': fsaa = atoi(&argv[i][2]); break; - case 'v': /* compat, ignore */ break; - case 't': fullscreen = atoi(&argv[i][2]); break; - case 's': /* compat, ignore */ break; - case 'f': /* compat, ignore */ break; - case 'l': { - char pkgdir[] = "packages/"; - load = strstr(path(&argv[i][2]), path(pkgdir)); - if(load) load += sizeof(pkgdir)-1; - else load = &argv[i][2]; - break; - } - case 'x': initscript = &argv[i][2]; break; - default: if(!serveroption(argv[i])) gameargs.add(argv[i]); break; - } - else gameargs.add(argv[i]); - } initing = NOT_INITING; numcpus = clamp(SDL_GetCPUCount(), 1, 16); if(dedicated <= 1) { logoutf("init: sdl"); if(SDL_Init(SDL_INIT_TIMER|SDL_INIT_VIDEO|SDL_INIT_AUDIO)<0) fatal("Unable to initialize SDL: %s", SDL_GetError()); - #ifdef SDL_VIDEO_DRIVER_X11 SDL_version version; SDL_GetVersion(&version); @@ -964,7 +920,6 @@ int main(int argc, char **argv) { atexit(enet_deinitialize); enet_time_set(0); logoutf("init: game"); - game::parseoptions(gameargs); initserver(dedicated>0, dedicated>1); // never returns if dedicated ASSERT(dedicated <= 1); game::initclient(); |
