net: more callbacks and still-non-working crap for master-comm

[d2df-sdl.git] / src / game / g_net.pas

diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index e6c1fbccb6b19deaec6cbb8e58ec3d41c9681eab..8e76d85e898358ccc56403e5f15977edc1a7b774 100644 (file)
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
@@ -1413,8 +1413,7 @@ begin
 
   NetPeer := nil;
   NetHost := nil;
 
   NetPeer := nil;
   NetHost := nil;

-  g_Net_Slist_NetworkStopped();
-  //g_Net_Slist_Disconnect(false); // do not spam console
+  g_Net_Slist_ServerClosed();

   NetMyID := -1;
   NetPlrUID1 := -1;
   NetPlrUID2 := -1;
   NetMyID := -1;
   NetPlrUID1 := -1;
   NetPlrUID2 := -1;


@@ -1549,8 +1548,7 @@ begin
     end;
 
   clearNetClients(false); // don't clear array
     end;
 
   clearNetClients(false); // don't clear array

-  //if (g_Net_Slist_IsConnectionActive) then g_Net_Slist_Disconnect;
-  g_Net_Slist_NetworkStopped();
+  g_Net_Slist_ServerClosed();

   if NetPongSock <> ENET_SOCKET_NULL then
     enet_socket_destroy(NetPongSock);
 
   if NetPongSock <> ENET_SOCKET_NULL then
     enet_socket_destroy(NetPongSock);
 


@@ -1620,7 +1618,6 @@ begin
     NetOut.Write(Byte(Ord('F')));
     NetOut.Write(NetPort);
     NetOut.Write(ClTime);
     NetOut.Write(Byte(Ord('F')));
     NetOut.Write(NetPort);
     NetOut.Write(ClTime);

-    //g_Net_Slist_WriteInfo();

     TMasterHost.writeInfo(NetOut);
     NPl := 0;
     if gPlayer1 <> nil then Inc(NPl);
     TMasterHost.writeInfo(NetOut);
     NPl := 0;
     if gPlayer1 <> nil then Inc(NPl);


@@ -1648,12 +1645,8 @@ begin
   IP := '';
   Result := 0;
 
   IP := '';
   Result := 0;
 

-  if NetUseMaster then
-  begin
-    //g_Net_Slist_Check;
-    g_Net_Slist_Pulse();
-  end;
-  g_Net_Host_CheckPings;
+  if NetUseMaster then g_Net_Slist_Pulse();
+  g_Net_Host_CheckPings();

 
   while (enet_host_service(NetHost, @NetEvent, 0) > 0) do
   begin
 
   while (enet_host_service(NetHost, @NetEvent, 0) > 0) do
   begin


@@ -1757,11 +1750,7 @@ begin
         g_Console_Add(_lc[I_NET_MSG] + Format(_lc[I_NET_MSG_HOST_DISC], [ID]));
         Dec(NetClientCount);
 
         g_Console_Add(_lc[I_NET_MSG] + Format(_lc[I_NET_MSG_HOST_DISC], [ID]));
         Dec(NetClientCount);
 

-        if NetUseMaster then
-        begin
-          //g_Net_Slist_Update;
-          g_Net_Slist_Pulse();
-        end;
+        if NetUseMaster then g_Net_Slist_ServerPlayerLeaves();

       end;
     end;
   end;
       end;
     end;
   end;