shithub: choc

Download patch

ref: 80fbe1a1d2fc32d13082a816a5521660318b0101
parent: 5d5c203ad4f587a804e96892d1d57ac7064dcd2a
author: Simon Howard <[email protected]>
date: Sat Oct 29 19:55:30 EDT 2011 

Update Strife multiplayer behavior to always use altdeath mode in
netgames, and remove code for -deathmatch parameter. Update setup tool
to remove game type dropdown when setting up a Strife game.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2470


--- a/src/setup/multiplayer.c
+++ b/src/setup/multiplayer.c
@@ -689,9 +689,15 @@
 
     if (multiplayer)
     {
-        TXT_AddWidgets(gameopt_table,
+        if (gamemission != strife)
+        {
+            TXT_AddWidgets(gameopt_table,
                TXT_NewLabel("Game type"),
                TXT_NewDropdownList(&deathmatch, gamemodes, num_mult_types),
+               NULL);
+        }
+
+        TXT_AddWidgets(gameopt_table,
                TXT_NewLabel("Time limit"),
                TXT_NewHorizBox(TXT_NewIntInputBox(&timer, 2),
                                TXT_NewLabel("minutes"),
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -1507,21 +1507,15 @@
     if(devparm)
         showintro = false;
 
-    //!
-    // @category net
-    // @vanilla
-    //
-    // Start a deathmatch game.
-    //
+    // Note: Strife *only* supports -altdeath mode. Vanilla
+    // Strife does not understand the -deathmatch command
+    // line parameter.
 
-    if (M_CheckParm ("-deathmatch"))
-        deathmatch = 1;
-
     //!
     // @category net
     // @vanilla
     //
-    // Start a deathmatch 2.0 game.  Weapons do not stay in place and
+    // Start a deathmatch game.  Weapons do not stay in place and
     // all items respawn after 30 seconds.
     //
 
--- a/src/strife/d_net.c
+++ b/src/strife/d_net.c
@@ -278,9 +278,18 @@
 
     LoadGameSettings(&settings, &connect_data);
 
-    DEH_printf("startskill %i  deathmatch: %i  startmap: %i  startepisode: %i\n",
-               startskill, deathmatch, startmap, startepisode);
+    // Strife netgames are *always* deathmatch,
+    // specifically altdeath mode.
 
+    if (netgame)
+    {
+        deathmatch = 2;
+    }
+
+    DEH_printf("startmap: %i, skill: %i, enemies: %i, random: %i\n",
+               startmap, startskill, !nomonsters, 0 /* ??? */);
+
+
     DEH_printf("player %i of %i (%i nodes)\n",
                consoleplayer+1, settings.num_players, settings.num_players);
 
@@ -304,3 +313,4 @@
         }
     }
 }
+