diff --git a/.hgignore b/.hgignore index 2b929760..ca1d897e 100644 --- a/.hgignore +++ b/.hgignore @@ -13,4 +13,6 @@ syntax: regexp ^MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/external/render/ ^MOULOpenSourceClientPlugin/Plasma20/test/ ^MOULOpenSourceClientPlugin/Plasma20/tools/ +^MOULOpenSourceClientPlugin/Plasma20/Doxy/ ^MOULOpenSourceClientPlugin/StaticSDKs/ +^patch/ diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp index 978aef9e..2b61278c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp @@ -5215,6 +5215,15 @@ void NetCliAuthStartConnect ( } } +//============================================================================ +unsigned NetCliAuthGetCurrentConnPort() { + unsigned port; + s_critsect.Enter(); + port = NetAddressGetPort(s_active->addr); + s_critsect.Leave(); + return port; +} + //============================================================================ bool NetCliAuthQueryConnected () { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h index d8d024db..9b21e766 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h @@ -66,6 +66,7 @@ void NetCliAuthStartConnect ( ); bool NetCliAuthQueryConnected (); void NetCliAuthAutoReconnectEnable (bool enable); // is enabled by default +unsigned NetCliAuthGetCurrentConnPort(); // for Game Server socket port // Called after the auth/client connection is encrypted typedef void (*FNetCliAuthConnectCallback)(); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp index e08fc897..a2132eda 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp @@ -743,7 +743,7 @@ void NetCliGameStartConnect ( const NetAddressNode & node ) { NetAddress addr; - NetAddressFromNode(node, kNetDefaultClientPort, &addr); + NetAddressFromNode(node, NetCliAuthGetCurrentConnPort(), &addr); Connect(addr); }