diff options
| author | Simon Howard | 2010-12-06 23:37:27 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-12-06 23:37:27 +0000 |
| commit | e4025e0a6a5e648ff59dd23973c5e7076a07eaa6 (patch) | |
| tree | f7cd9d9c6d4fde51dc3a42c393050ace1ac34a0b /src | |
| parent | 35104488f0c896dbb43d6841a89a629b2ed248a4 (diff) | |
| download | chocolate-doom-e4025e0a6a5e648ff59dd23973c5e7076a07eaa6.tar.gz chocolate-doom-e4025e0a6a5e648ff59dd23973c5e7076a07eaa6.tar.bz2 chocolate-doom-e4025e0a6a5e648ff59dd23973c5e7076a07eaa6.zip | |
Fix -solo-net to actually behave the same as other ports.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2198
Diffstat (limited to 'src')
| -rw-r--r-- | src/d_net.c | 17 | ||||
| -rw-r--r-- | src/g_game.c | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/d_net.c b/src/d_net.c index bf9fbf2b..ae5a6d62 100644 --- a/src/d_net.c +++ b/src/d_net.c @@ -200,8 +200,8 @@ void NetUpdate (void) G_BuildTiccmd(&cmd); #ifdef FEATURE_MULTIPLAYER - - if (netgame && !demoplayback) + + if (net_client_connected) { NET_CL_SendTiccmd(&cmd, maketic); } @@ -254,6 +254,19 @@ void D_CheckNetGame (void) 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 { diff --git a/src/g_game.c b/src/g_game.c index d2694250..59550513 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2217,12 +2217,6 @@ 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("-solo-net") > 0 || M_CheckParm("-netdemo") > 0) { |