[ioquake3] 25/50: Make UI continue searching for local servers until found

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 0ba359c29ec543ba4b6bdf62d1daa603208952d7
Author: Zack Middleton <zack at cloemail.com>
Date:   Sat Jul 1 12:46:54 2017 -0500

    Make UI continue searching for local servers until found
    
    When refreshing local servers, Team Arean UI never changed the status
    message when it timed out. This gave a false impression it was still
    looking for servers.
    
    Let's continue looking for local servers in q3_ui and Team Arena UI
    until one is found.
---
 code/q3_ui/ui_servers2.c | 7 +++++++
 code/ui/ui_main.c        | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/code/q3_ui/ui_servers2.c b/code/q3_ui/ui_servers2.c
index d376d36..b6c4ea5 100644
--- a/code/q3_ui/ui_servers2.c
+++ b/code/q3_ui/ui_servers2.c
@@ -881,6 +881,13 @@ static void ArenaServers_DoRefresh( void )
 			  return;
 			}
 	  }
+	} else if (g_servertype == UIAS_LOCAL) {
+		if (!trap_LAN_GetServerCount(AS_LOCAL)) {
+			// no local servers found, check again
+			trap_Cmd_ExecuteText( EXEC_APPEND, "localservers\n" );
+			g_arenaservers.refreshtime = uis.realtime + 5000;
+			return;
+		}
 	}
 
 	if (uis.realtime < g_arenaservers.nextpingtime)
diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c
index c4f3ba5..81b324b 100644
--- a/code/ui/ui_main.c
+++ b/code/ui/ui_main.c
@@ -5985,6 +5985,10 @@ static void UI_DoServerRefresh( void )
 		UI_BuildServerDisplayList(2);
 		// stop the refresh
 		UI_StopServerRefresh();
+	} else if ( ui_netSource.integer == UIAS_LOCAL ) {
+		// no local servers found, check again
+		trap_Cmd_ExecuteText( EXEC_NOW, "localservers\n" );
+		uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 5000;
 	}
 	//
 	UI_BuildServerDisplayList(qfalse);
@@ -6032,7 +6036,7 @@ static void UI_StartServerRefresh(qboolean full, qboolean force)
 	//
 	if( ui_netSource.integer == UIAS_LOCAL ) {
 		trap_Cmd_ExecuteText( EXEC_NOW, "localservers\n" );
-		uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 1000;
+		uiInfo.serverStatus.refreshtime = uiInfo.uiDC.realTime + 5000;
 		return;
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git