summaryrefslogtreecommitdiff
path: root/src/doom/d_net.c
diff options
context:
space:
mode:
authorSimon Howard2010-12-10 23:46:22 +0000
committerSimon Howard2010-12-10 23:46:22 +0000
commitd1a3967194323b08227b20822acedb837e05281a (patch)
tree39e4f4da91717159f4f82e6eb37c9fb32d306892 /src/doom/d_net.c
parent6a2d4763a9080cf88ca9f0b588b8187963eeacf5 (diff)
parente225e0c93ce58bb0e33c174847305d39800fd755 (diff)
downloadchocolate-doom-d1a3967194323b08227b20822acedb837e05281a.tar.gz
chocolate-doom-d1a3967194323b08227b20822acedb837e05281a.tar.bz2
chocolate-doom-d1a3967194323b08227b20822acedb837e05281a.zip
Merge from trunk.
Subversion-branch: /branches/raven-branch Subversion-revision: 2214
Diffstat (limited to 'src/doom/d_net.c')
-rw-r--r--src/doom/d_net.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/doom/d_net.c b/src/doom/d_net.c
index b307d97f..70359ebd 100644
--- a/src/doom/d_net.c
+++ b/src/doom/d_net.c
@@ -204,8 +204,8 @@ void NetUpdate (void)
G_BuildTiccmd(&cmd);
#ifdef FEATURE_MULTIPLAYER
-
- if (netgame && !demoplayback)
+
+ if (net_client_connected)
{
NET_CL_SendTiccmd(&cmd, maketic);
}
@@ -460,6 +460,19 @@ void D_InitSinglePlayerGame(void)
recvtic = 0;
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;
+ }
}
boolean D_InitNetGame(net_connect_data_t *connect_data,
@@ -468,6 +481,7 @@ boolean D_InitNetGame(net_connect_data_t *connect_data,
net_addr_t *addr = NULL;
int i;
+
#ifdef FEATURE_MULTIPLAYER
//!