summaryrefslogtreecommitdiff
path: root/src/strife
diff options
context:
space:
mode:
Diffstat (limited to 'src/strife')
-rw-r--r--src/strife/d_main.c6
-rw-r--r--src/strife/d_net.c8
2 files changed, 7 insertions, 7 deletions
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",