Split Doom netgame startup into two stages.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2583

1 files changed, 12 insertions, 12 deletions

diff --git a/src/doom/d_net.c b/src/doom/d_net.c
index 29e2e7c6..15f1098e 100644
--- a/src/doom/d_net.c
+++ b/src/doom/d_net.c
@@ -216,20 +216,9 @@ static void InitConnectData(net_connect_data_t *connect_data)
     connect_data->is_freedoom = W_CheckNumForName("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(&doom_loop_interface);
-
-    // Call D_QuitNetGame on exit
-
-    I_AtExit(D_QuitNetGame, true);
 
     InitConnectData(&connect_data);
     netgame = D_InitNetGame(&connect_data);
@@ -246,12 +235,23 @@ void D_CheckNetGame (void)
     {
         netgame = true;
     }
+}
+
+//
+// D_CheckNetGame
+// Works out player numbers among the net participants
+//
+void D_CheckNetGame (void)
+{
+    net_gamesettings_t settings;
 
     if (netgame)
     {
         autostart = true;
     }
 
+    D_RegisterLoopCallbacks(&doom_loop_interface);
+
     SaveGameSettings(&settings);
     D_StartNetGame(&settings);
     LoadGameSettings(&settings);