shithub: choc

Download patch

ref: e4025e0a6a5e648ff59dd23973c5e7076a07eaa6
parent: 35104488f0c896dbb43d6841a89a629b2ed248a4
author: Simon Howard <[email protected]>
date: Mon Dec 6 18:37:27 EST 2010

Fix -solo-net to actually behave the same as other ports.

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

--- a/src/d_net.c
+++ b/src/d_net.c
@@ -200,8 +200,8 @@
 	G_BuildTiccmd(&cmd);
 
 #ifdef FEATURE_MULTIPLAYER
-        
-        if (netgame && !demoplayback)
+
+        if (net_client_connected)
         {
             NET_CL_SendTiccmd(&cmd, maketic);
         }
@@ -253,6 +253,19 @@
     }
 
     playeringame[0] = true;
+
+    //!
+    // @category net
+    //
+    // Start the game playing as though in a netgame with a single
+    // player.  This can also be used to play back single player netgame
+    // demos.
+    //
+
+    if (M_CheckParm("-solo-net") > 0)
+    {
+        netgame = true;
+    }
 
 #ifdef FEATURE_MULTIPLAYER
 
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2217,12 +2217,6 @@
     for (i=0 ; i<MAXPLAYERS ; i++) 
 	playeringame[i] = *demo_p++; 
 
-    //!
-    // @category demo
-    // 
-    // Play back a demo recorded in a netgame with a single player.
-    //
-
     if (playeringame[1] || M_CheckParm("-solo-net") > 0
                         || M_CheckParm("-netdemo") > 0)
     {