commit 085797aeb4c05857b315ebf4448322829151aedc
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Apr 24 22:22:11 2011 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sun Apr 24 22:22:11 2011 +0000
Infer -server when -privateserver is specified (thanks Porsche Monty).
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2330
---
NEWS | 2 ++
src/d_net.c | 3 ++-
src/net_server.c | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 8569bfd7..d74aef7b 100644
--- 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
diff --git a/src/d_net.c b/src/d_net.c
index 57fe2399..558c3e4d 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -278,7 +278,8 @@ void D_CheckNetGame (void)
// 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);
diff --git a/src/net_server.c b/src/net_server.c
index b3a9ea92..d889c120 100644
--- a/src/net_server.c
+++ b/src/net_server.c
@@ -1565,6 +1565,7 @@ void NET_SV_RegisterWithMaster(void)
{
//!
// When running a server, don't register with the global master server.
+ // Implies -server.
//
// @category net
//