From 434f95234083ef9a08cc39c3f3906a969ba18725 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 30 Oct 2011 00:26:32 +0000
Subject: Fix previous change - Strife games are not always -altdeath; the
 default is -deathmatch and -altdeath enables Deathmatch II mode.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2471
---
 src/strife/d_main.c | 6 +++---
 src/strife/d_net.c  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/strife')

diff --git a/src/strife/d_main.c b/src/strife/d_main.c
index 816cbd7b..f522f332 100644
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -1507,9 +1507,9 @@ void D_DoomMain (void)
     if(devparm)
         showintro = false;
 
-    // Note: Strife *only* supports -altdeath mode. Vanilla
-    // Strife does not understand the -deathmatch command
-    // line parameter.
+    // Note: Vanilla Strife does not understand the -deathmatch command
+    // line parameter. deathmatch=1 is the default behavior when
+    // playing a netgame.
 
     //!
     // @category net
diff --git a/src/strife/d_net.c b/src/strife/d_net.c
index 021bbf91..cd0a5e66 100644
--- a/src/strife/d_net.c
+++ b/src/strife/d_net.c
@@ -278,12 +278,12 @@ void D_CheckNetGame (void)
 
     LoadGameSettings(&settings, &connect_data);
 
-    // Strife netgames are *always* deathmatch,
-    // specifically altdeath mode.
+    // Strife games are always deathmatch, though -altdeath is
+    // supported for respawning items.
 
-    if (netgame)
+    if (netgame && deathmatch == 0)
     {
-        deathmatch = 2;
+        deathmatch = 1;
     }
 
     DEH_printf("startmap: %i, skill: %i, enemies: %i, random: %i\n",
-- 
cgit v1.2.3