[iortcw] 83/95: All: Make server list sub-sort clients by max clients

[Simon McVittie]

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

smcv pushed a commit to tag 1.51
in repository iortcw.

commit 480f3e441874460a48004e3a9461d9b93d07da5e
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sat Jun 3 10:15:41 2017 -0400

    All: Make server list sub-sort clients by max clients
    
    Unused in SP
---
 MP/code/client/cl_ui.c | 15 ++++++++++++---
 SP/code/client/cl_ui.c | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/MP/code/client/cl_ui.c b/MP/code/client/cl_ui.c
index eb3ba2a..94c7045 100644
--- a/MP/code/client/cl_ui.c
+++ b/MP/code/client/cl_ui.c
@@ -391,6 +391,7 @@ LAN_CompareServers
 static int LAN_CompareServers( int source, int sortKey, int sortDir, int s1, int s2 ) {
 	int res;
 	serverInfo_t *server1, *server2;
+	int clients1, clients2;
 
 	server1 = LAN_GetServerPtr( source, s1 );
 	server2 = LAN_GetServerPtr( source, s2 );
@@ -403,14 +404,22 @@ static int LAN_CompareServers( int source, int sortKey, int sortDir, int s1, int
 	case SORT_HOST:
 		res = Q_stricmp( server1->hostName, server2->hostName );
 		break;
-
 	case SORT_MAP:
 		res = Q_stricmp( server1->mapName, server2->mapName );
 		break;
 	case SORT_CLIENTS:
-		if ( server1->clients < server2->clients ) {
+		// sub sort by max clients
+		if ( server1->clients == server2->clients ) {
+			clients1 = server1->maxClients;
+			clients2 = server2->maxClients;
+		} else {
+			clients1 = server1->clients;
+			clients2 = server2->clients;
+		}
+
+		if ( clients1 < clients2 ) {
 			res = -1;
-		} else if ( server1->clients > server2->clients )     {
+		} else if ( clients1 > clients2 ) {
 			res = 1;
 		} else {
 			res = 0;
diff --git a/SP/code/client/cl_ui.c b/SP/code/client/cl_ui.c
index e09c150..80bf977 100644
--- a/SP/code/client/cl_ui.c
+++ b/SP/code/client/cl_ui.c
@@ -396,6 +396,7 @@ LAN_CompareServers
 static int LAN_CompareServers( int source, int sortKey, int sortDir, int s1, int s2 ) {
 	int res;
 	serverInfo_t *server1, *server2;
+	int clients1, clients2;
 
 	server1 = LAN_GetServerPtr( source, s1 );
 	server2 = LAN_GetServerPtr( source, s2 );
@@ -408,14 +409,22 @@ static int LAN_CompareServers( int source, int sortKey, int sortDir, int s1, int
 	case SORT_HOST:
 		res = Q_stricmp( server1->hostName, server2->hostName );
 		break;
-
 	case SORT_MAP:
 		res = Q_stricmp( server1->mapName, server2->mapName );
 		break;
 	case SORT_CLIENTS:
-		if ( server1->clients < server2->clients ) {
+		// sub sort by max clients
+		if ( server1->clients == server2->clients ) {
+			clients1 = server1->maxClients;
+			clients2 = server2->maxClients;
+		} else {
+			clients1 = server1->clients;
+			clients2 = server2->clients;
+		}
+
+		if ( clients1 < clients2 ) {
 			res = -1;
-		} else if ( server1->clients > server2->clients )     {
+		} else if ( clients1 > clients2 ) {
 			res = 1;
 		} else {
 			res = 0;

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