summaryrefslogtreecommitdiff
path: root/src/strife/d_net.c
diff options
context:
space:
mode:
authorSimon Howard2013-04-05 21:23:46 +0000
committerSimon Howard2013-04-05 21:23:46 +0000
commitcffe694cd613ac7c1a738f50e883a904d2813047 (patch)
treee8657763391f934783f974811ee99192096f78ea /src/strife/d_net.c
parentf1bde3d5212cab46aa9f40bec29e8a72013f8a41 (diff)
downloadchocolate-doom-cffe694cd613ac7c1a738f50e883a904d2813047.tar.gz
chocolate-doom-cffe694cd613ac7c1a738f50e883a904d2813047.tar.bz2
chocolate-doom-cffe694cd613ac7c1a738f50e883a904d2813047.zip
Use two-stage netgame startup for Strife, and restore the previous
startup splash-screen behavior (before it was modified in r2435). Subversion-branch: /branches/v2-branch Subversion-revision: 2586
Diffstat (limited to 'src/strife/d_net.c')
-rw-r--r--src/strife/d_net.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/strife/d_net.c b/src/strife/d_net.c
index 0a5caa90..002298bd 100644
--- a/src/strife/d_net.c
+++ b/src/strife/d_net.c
@@ -220,16 +220,9 @@ static void InitConnectData(net_connect_data_t *connect_data)
connect_data->is_freedoom = 0;
}
-//
-// D_CheckNetGame
-// Works out player numbers among the net participants
-//
-void D_CheckNetGame (void)
+void D_ConnectNetGame(void)
{
net_connect_data_t connect_data;
- net_gamesettings_t settings;
-
- D_RegisterLoopCallbacks(&strife_loop_interface);
InitConnectData(&connect_data);
netgame = D_InitNetGame(&connect_data);
@@ -246,6 +239,17 @@ void D_CheckNetGame (void)
{
netgame = true;
}
+}
+
+//
+// D_CheckNetGame
+// Works out player numbers among the net participants
+//
+void D_CheckNetGame(void)
+{
+ net_gamesettings_t settings;
+
+ D_RegisterLoopCallbacks(&strife_loop_interface);
if (netgame)
{