diff options
Diffstat (limited to 'src/mastersrv/mastersrv.cpp')
| -rw-r--r-- | src/mastersrv/mastersrv.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/mastersrv/mastersrv.cpp b/src/mastersrv/mastersrv.cpp index 624a9f3fe..e19672313 100644 --- a/src/mastersrv/mastersrv.cpp +++ b/src/mastersrv/mastersrv.cpp @@ -280,14 +280,11 @@ void ReloadBans() m_pConsole->ExecuteFile("master.cfg"); } -int main(int argc, const char **argv) // ignore_convention +int main(int argc, const char **argv) { - int64 LastBuild = 0, LastBanReload = 0; - ServerType Type = SERVERTYPE_INVALID; - NETADDR BindAddr; - dbg_logger_stdout(); - + cmdline_fix(&argc, &argv); + mem_copy(m_CountData.m_Header, SERVERBROWSE_COUNT, sizeof(SERVERBROWSE_COUNT)); int FlagMask = CFGFLAG_MASTER; @@ -307,9 +304,10 @@ int main(int argc, const char **argv) // ignore_convention pConfigManager->Init(FlagMask); m_pConsole->Init(); m_NetBan.Init(m_pConsole, pStorage); - if(argc > 1) // ignore_convention - m_pConsole->ParseArguments(argc-1, &argv[1]); // ignore_convention + if(argc > 1) + m_pConsole->ParseArguments(argc-1, &argv[1]); + NETADDR BindAddr; if(pConfig->m_Bindaddr[0] && net_host_lookup(pConfig->m_Bindaddr, &BindAddr, NETTYPE_ALL) == 0) { // got bindaddr @@ -345,6 +343,8 @@ int main(int argc, const char **argv) // ignore_convention dbg_msg("mastersrv", "started"); + int64 LastBuild = 0, LastBanReload = 0; + ServerType Type = SERVERTYPE_INVALID; while(1) { m_NetOp.Update(); @@ -460,5 +460,6 @@ int main(int argc, const char **argv) // ignore_convention thread_sleep(1); } + cmdline_free(argc, argv); return 0; } |