From 56e77d4fec8567abb1188c03e6dbfae761ac04fc Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 24 Dec 2015 04:01:28 +0000 Subject: [PATCH] Move MplUdpHostPort to CArg --- common/include/args.h | 2 +- similar/main/net_udp.cpp | 2 +- similar/misc/args.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/include/args.h b/common/include/args.h index 865065c4a..b71a8b5e7 100644 --- a/common/include/args.h +++ b/common/include/args.h @@ -114,6 +114,7 @@ struct CArg : prohibit_void_ptr int8_t DbgVerbose; bool SysNoNiceFPS; int SysMaxFPS; + uint16_t MplUdpHostPort; std::string SysMissionDir; std::string SysHogDir; std::string SysPilot; @@ -138,7 +139,6 @@ struct Arg : prohibit_void_ptr bool GfxSkipHiresGFX; int SndDigiSampleRate; #endif - uint16_t MplUdpHostPort; uint16_t MplUdpMyPort; #ifdef USE_TRACKER uint16_t MplTrackerPort; diff --git a/similar/main/net_udp.cpp b/similar/main/net_udp.cpp index b2a93d693..b367e327c 100644 --- a/similar/main/net_udp.cpp +++ b/similar/main/net_udp.cpp @@ -988,7 +988,7 @@ void net_udp_manual_join_game() net_udp_init(); snprintf(dj->addrbuf, sizeof(dj->addrbuf), "%s", CGameArg.MplUdpHostAddr.c_str()); - snprintf(dj->hostportbuf, sizeof(dj->hostportbuf), "%hu", GameArg.MplUdpHostPort ? GameArg.MplUdpHostPort : UDP_PORT_DEFAULT); + snprintf(dj->hostportbuf, sizeof(dj->hostportbuf), "%hu", CGameArg.MplUdpHostPort ? CGameArg.MplUdpHostPort : UDP_PORT_DEFAULT); reset_UDP_MyPort(); diff --git a/similar/misc/args.cpp b/similar/misc/args.cpp index e7861ba76..d72e5394d 100644 --- a/similar/misc/args.cpp +++ b/similar/misc/args.cpp @@ -301,7 +301,7 @@ static void ReadCmdArgs(Inilist &ini, Arglist &Args) /* Peers use -udp_myport to change, so peer cannot set a * privileged port. */ - arg_port_number(pp, end, GameArg.MplUdpHostPort, false); + arg_port_number(pp, end, CGameArg.MplUdpHostPort, false); else if (!d_stricmp(p, "-udp_myport")) { arg_port_number(pp, end, GameArg.MplUdpMyPort, false);