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

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)
     {