diff options
Diffstat (limited to 'src/engine/server')
| -rw-r--r-- | src/engine/server/server.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/src/engine/server/server.c b/src/engine/server/server.c index b1bf5e4d..8b591de6 100644 --- a/src/engine/server/server.c +++ b/src/engine/server/server.c @@ -4,7 +4,7 @@ #include <engine/system.h> #include <engine/config.h> - +#include <engine/engine.h> #include <engine/interface.h> #include <engine/protocol.h> @@ -29,7 +29,6 @@ static NETADDR4 master_server; static char current_map[64]; - void *snap_new_item(int type, int id, int size) { dbg_assert(type >= 0 && type <=0xffff, "incorrect type"); @@ -822,32 +821,8 @@ static int server_run() int main(int argc, char **argv) { -#ifdef CONF_PLATFORM_MACOSX - const char *config_filename = "~/.teewars"; -#else - const char *config_filename = "default.cfg"; -#endif - int i; - dbg_msg("server", "starting..."); - - config_reset(); - - for(i = 1; i < argc; i++) - { - if(argv[i][0] == '-' && argv[i][1] == 'f' && argv[i][2] == 0 && argc - i > 1) - { - config_filename = argv[i+1]; - i++; - } - } - - config_load(config_filename); - - /* parse arguments */ - for(i = 1; i < argc; i++) - config_set(argv[i]); - + engine_init("Teewars", argc, argv); server_run(); return 0; } |