shithub: choc

Download patch

ref: 085797aeb4c05857b315ebf4448322829151aedc
parent: 9f4221bf92510f417bb9263031ca4f18db10e54f
author: Simon Howard <[email protected]>
date: Sun Apr 24 18:22:11 EDT 2011

Infer -server when -privateserver is specified (thanks Porsche Monty).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2330

--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@
        to the same key from being cleared (thanks myk).
      * The joystick menu in the setup tool now has a test button
        (thanks Alexandre Xavier).
+     * Specifying the -privateserver option implies -server (thanks
+       Porsche Monty).
 
     Compatibility:
      * Added support for the alternate version of the Final Doom
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -278,7 +278,8 @@
         // Start a multiplayer server, listening for connections.
         //
 
-        if (M_CheckParm("-server") > 0)
+        if (M_CheckParm("-server") > 0
+         || M_CheckParm("-privateserver") > 0)
         {
             NET_SV_Init();
             NET_SV_AddModule(&net_loop_server_module);
--- a/src/net_server.c
+++ b/src/net_server.c
@@ -1565,6 +1565,7 @@
 {
     //!
     // When running a server, don't register with the global master server.
+    // Implies -server.
     //
     // @category net
     //