Removed cvar net-port-control and added "-port" option

net-port-control was essentially an alias for net-ip-port. No need to keep both names…
skyjake · Dec 20, 2011 · fd47531 · fd47531
1 parent 9bc0170
commit fd47531
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/doomsday/engine/data/cphelp.txt b/doomsday/engine/data/cphelp.txt
@@ -962,12 +962,6 @@ desc = TCP/IP address for searching servers.
 [net-ip-port]
 desc = TCP port to use for control connections.
 
-[net-port-control]
-desc = TCP port to use for control connections.
-
-[net-port-data]
-desc = UDP port to use for client data traffic.
-
 [net-queue-show]
 desc = Monitor send queue.
 

diff --git a/doomsday/engine/portable/src/dd_main.c b/doomsday/engine/portable/src/dd_main.c
@@ -433,6 +433,10 @@ int DD_Main(void)
     if(ArgCheckWith("-connect", 1))
         Con_Executef(CMDS_CMDLINE, false, "connect %s", ArgNext());
 
+    // Incoming TCP port.
+    if(ArgCheckWith("-port", 1))
+        Con_Executef(CMDS_CMDLINE, false, "net-ip-port %i", ArgNext());
+
     // Server start command.
     // (shortcut for -command "net init tcpip; net server start").
     if(ArgExists("-server"))

diff --git a/doomsday/engine/portable/src/sys_network.c b/doomsday/engine/portable/src/sys_network.c
@@ -175,8 +175,6 @@ void N_Register(void)
 {
     C_VAR_CHARPTR("net-ip-address", &nptIPAddress, 0, 0, 0);
     C_VAR_INT("net-ip-port", &nptIPPort, CVF_NO_MAX, 0, 0);
-    C_VAR_INT("net-port-control", &nptIPPort, CVF_NO_MAX, 0, 0);
-    //C_VAR_INT("net-port-data", &nptUDPPort, CVF_NO_MAX, 0, 0);
 }
 
 static void N_StartJoinedListener(void)

diff --git a/doomsday/engine/portable/src/ui_mpi.c b/doomsday/engine/portable/src/ui_mpi.c
@@ -383,8 +383,7 @@ void MPIGoBack(ui_object_t *ob)
 void MPIStartServer(ui_object_t *ob)
 {
     N_ShutdownService();
-    Con_SetInteger("net-port-control", strtol(str_ipport, 0, 0), true);
-    //Con_SetInteger("net-port-data", strtol(str_myudp, 0, 0), true);
+    Con_SetInteger("net-ip-port", strtol(str_ipport, 0, 0), true);
     N_InitService(true);
 
     // Update the variables.