changed master server list around a bit (added rick.cube-sol.net and my master server...

[xonotic/darkplaces.git] / net_main.c

diff --git a/net_main.c b/net_main.c
index ed2d341d979e636d1328affb0321e6b4b8373dda..0697022f4f73941626ce8354e9c884a5e2c731e0 100644 (file)
--- a/net_main.c
+++ b/net_main.c
@@ -228,7 +228,7 @@ static void NET_Port_f (void)
 
 static void NET_Heartbeat_f (void)
 {
-       NET_Heartbeat ();
+       NET_Heartbeat (2);
 }
 
 
@@ -260,49 +260,48 @@ static void PrintSlistTrailer(void)
        if (hostCacheCount)
                Con_Printf("== end list ==\n\n");
        else
-               Con_Printf("No Quake servers found.\n\n");
+       {
+               if (gamemode == GAME_TRANSFUSION)
+                       Con_Printf("No Transfusion servers found.\n\n");
+               else
+                       Con_Printf("No Quake servers found.\n\n");
+       }
 }
 
 
-void NET_Slist_f (void)
+void NET_SlistCommon (PollProcedure *sendProcedure, PollProcedure *pollProcedure)
 {
        if (slistInProgress)
                return;
 
        if (! slistSilent)
        {
-               Con_Printf("Looking for Quake servers...\n");
+               if (gamemode == GAME_TRANSFUSION)
+                       Con_Printf("Looking for Transfusion servers...\n");
+               else
+                       Con_Printf("Looking for Quake servers...\n");
                PrintSlistHeader();
        }
 
        slistInProgress = true;
        slistStartTime = Sys_DoubleTime();
 
-       SchedulePollProcedure(&slistSendProcedure, 0.0);
-       SchedulePollProcedure(&slistPollProcedure, 0.1);
+       SchedulePollProcedure(sendProcedure, 0.0);
+       SchedulePollProcedure(pollProcedure, 0.1);
 
        hostCacheCount = 0;
 }
 
 
-void NET_InetSlist_f (void)
+void NET_Slist_f (void)
 {
-       if (slistInProgress)
-               return;
-
-       if (! slistSilent)
-       {
-               Con_Printf("Looking for Quake servers...\n");
-               PrintSlistHeader();
-       }
-
-       slistInProgress = true;
-       slistStartTime = Sys_DoubleTime();
+       NET_SlistCommon (&slistSendProcedure, &slistPollProcedure);
+}
 
-       SchedulePollProcedure(&inetSlistSendProcedure, 0.0);
-       SchedulePollProcedure(&inetSlistPollProcedure, 0.1);
 
-       hostCacheCount = 0;
+void NET_InetSlist_f (void)
+{
+       NET_SlistCommon (&inetSlistSendProcedure, &inetSlistPollProcedure);
 }
 
 
@@ -352,7 +351,7 @@ static void Slist_Poll(void)
 
 static void InetSlist_Send(void)
 {
-       char* host;
+       const char* host;
 
        if (!slistInProgress)
                return;
@@ -683,9 +682,13 @@ NET_Heartbeat
 Send an heartbeat to the master server(s)
 ====================
 */
-void NET_Heartbeat (void)
+void NET_Heartbeat (int priority)
 {
-       char* host;
+       const char* host;
+
+       if (! Master_AllowHeartbeat (priority))
+               return;
+
        while ((host = Master_BuildHeartbeat ()) != NULL)
        {
                for (net_driverlevel=0 ; net_driverlevel<net_numdrivers; net_driverlevel++)