Merge of fixserverport and pr47 for testing temporarily

server port to Game client connection code.

For use where non-default port is being used for Auth/Game servers.

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 () {
 

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)();

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);
 }