diff options
| author | Simon Howard | 2010-12-10 23:46:22 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-12-10 23:46:22 +0000 |
| commit | d1a3967194323b08227b20822acedb837e05281a (patch) | |
| tree | 39e4f4da91717159f4f82e6eb37c9fb32d306892 /src/doom | |
| parent | 6a2d4763a9080cf88ca9f0b588b8187963eeacf5 (diff) | |
| parent | e225e0c93ce58bb0e33c174847305d39800fd755 (diff) | |
| download | chocolate-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')
| -rw-r--r-- | src/doom/d_net.c | 18 | ||||
| -rw-r--r-- | src/doom/g_game.c | 15 |
2 files changed, 21 insertions, 12 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 //! diff --git a/src/doom/g_game.c b/src/doom/g_game.c index 0aaf8ee7..5d30899d 100644 --- a/src/doom/g_game.c +++ b/src/doom/g_game.c @@ -2145,16 +2145,11 @@ void G_DoPlayDemo (void) 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("-netdemo") > 0) - { - netgame = true; - netdemo = true; + if (playeringame[1] || M_CheckParm("-solo-net") > 0 + || M_CheckParm("-netdemo") > 0) + { + netgame = true; + netdemo = true; } // don't spend a lot of time in loadlevel |