From: Simon McVittie <smcv@debian.org>
Date: Wed, 11 Aug 2010 22:15:46 +0100
Subject: [PATCH] Put g_humanplayers and g_needpass in server info

OpenArena uses these in its UI, and they seem like useful things to know.

Origin: OpenArena
Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4702
Forwarded: yes
---
 code/client/cl_main.c |    4 ++++
 code/client/cl_ui.c   |    2 ++
 code/client/client.h  |    2 ++
 code/server/sv_main.c |    2 ++
 4 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index 15cf3db..6e897fa 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -3356,6 +3356,8 @@ static void CL_SetServerInfo(serverInfo_t *server, const char *info, int ping) {
 			server->minPing = atoi(Info_ValueForKey(info, "minping"));
 			server->maxPing = atoi(Info_ValueForKey(info, "maxping"));
 			server->punkbuster = atoi(Info_ValueForKey(info, "punkbuster"));
+			server->g_humanplayers = atoi(Info_ValueForKey(info, "g_humanplayers"));
+			server->g_needpass = atoi(Info_ValueForKey(info, "g_needpass"));
 		}
 		server->ping = ping;
 	}
@@ -3474,6 +3476,8 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
 	cls.localServers[i].gameType = 0;
 	cls.localServers[i].netType = from.type;
 	cls.localServers[i].punkbuster = 0;
+	cls.localServers[i].g_humanplayers = 0;
+	cls.localServers[i].g_needpass = 0;
 									 
 	Q_strncpyz( info, MSG_ReadString( msg ), MAX_INFO_STRING );
 	if (strlen(info)) {
diff --git a/code/client/cl_ui.c b/code/client/cl_ui.c
index adda0db..00857ed 100644
--- a/code/client/cl_ui.c
+++ b/code/client/cl_ui.c
@@ -298,6 +298,8 @@ static void LAN_GetServerInfo( int source, int n, char *buf, int buflen ) {
 		Info_SetValueForKey( info, "nettype", va("%i",server->netType));
 		Info_SetValueForKey( info, "addr", NET_AdrToStringwPort(server->adr));
 		Info_SetValueForKey( info, "punkbuster", va("%i", server->punkbuster));
+		Info_SetValueForKey( info, "g_needpass", va("%i", server->g_needpass));
+		Info_SetValueForKey( info, "g_humanplayers", va("%i", server->g_humanplayers));
 		Q_strncpyz(buf, info, buflen);
 	} else {
 		if (buf) {
diff --git a/code/client/client.h b/code/client/client.h
index 7891a83..c105fb8 100644
--- a/code/client/client.h
+++ b/code/client/client.h
@@ -296,6 +296,8 @@ typedef struct {
 	int			ping;
 	qboolean	visible;
 	int			punkbuster;
+	int			g_humanplayers;
+	int			g_needpass;
 } serverInfo_t;
 
 typedef struct {
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index 9f20128..0878544 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -659,6 +659,8 @@ void SVC_Info( netadr_t from ) {
 	if( *gamedir ) {
 		Info_SetValueForKey( infostring, "game", gamedir );
 	}
+	Info_SetValueForKey( infostring, "g_needpass", Cvar_VariableIntegerValue( "g_needpass" ));
+	Info_SetValueForKey( infostring, "g_humanplayers", Cvar_VariableIntegerValue( "g_humanplayers" ));
 
 	NET_OutOfBandPrint( NS_SERVER, from, "infoResponse\n%s", infostring );
 }
--