X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=netconn.c;h=c6b3ea03a3278f6e202a1fdde48da1f7a4de1548;hb=d45d5661b7689e3bc5e2c31d96aad3670eea84f6;hp=e2095d9197bc82c13ca13c6f2d7a9da77ba5e6b5;hpb=9c8b4bcf2b8614917b5a79f5cf7f4c30e76d7e85;p=xonotic%2Fdarkplaces.git

diff --git a/netconn.c b/netconn.c
index e2095d91..c6b3ea03 100755
--- a/netconn.c
+++ b/netconn.c
@@ -62,7 +62,7 @@ static cvar_t sv_qwmasters [] =
 	{0, "sv_qwmasterextra2", "asgaard.morphos-team.net:27000", "Global master server. (admin: unknown)"},
 	{0, "sv_qwmasterextra3", "qwmaster.ocrana.de:27000", "German master server. (admin: unknown)"},
 	{0, "sv_qwmasterextra4", "masterserver.exhale.de:27000", "German master server. (admin: unknown)"},
-	{0, "sv_qwmasterextra5", "kubus.rulez.pl:27000", "Poland master server. (admin: unknown)"},
+	{0, "sv_qwmasterextra5", "qwmaster.fodquake.net:27000", "Global master server. (admin: unknown)"},
 	{0, NULL, NULL, NULL}
 };
 
@@ -413,8 +413,8 @@ static void ServerList_ViewList_Insert( serverlist_entry_t *entry )
 		!(
 			   gameversion_min.integer >= 0 // min/max range set by user/mod?
 			&& gameversion_max.integer >= 0
-			&& gameversion_min.integer >= entry->info.gameversion // version of server in min/max range?
-			&& gameversion_max.integer <= entry->info.gameversion
+			&& gameversion_min.integer <= entry->info.gameversion // version of server in min/max range?
+			&& gameversion_max.integer >= entry->info.gameversion
 		 )
 	)
 		return;
@@ -1498,8 +1498,8 @@ static void NetConn_ClientParsePacket_ServerList_UpdateCache(int n)
 			 !(
 				    gameversion_min.integer >= 0 // min/max range set by user/mod?
 				 && gameversion_max.integer >= 0
-				 && gameversion_min.integer >= info->gameversion // version of server in min/max range?
-				 && gameversion_max.integer <= info->gameversion
+				 && gameversion_min.integer <= info->gameversion // version of server in min/max range?
+				 && gameversion_max.integer >= info->gameversion
 			  )
 			) ? '1' : '4',
 			info->mod, info->map);
@@ -2287,6 +2287,7 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg
 	int length;
 	char teambuf[3];
 	const char *crypto_idstring;
+	const char *str;
 
 	SV_VM_Begin();
 
@@ -2302,19 +2303,16 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg
 	}
 
 	*qcstatus = 0;
-	if(prog->globaloffsets.worldstatus >= 0)
+	str = PRVM_GetString(PRVM_serverglobalstring(worldstatus));
+	if(str && *str)
 	{
-		const char *str = PRVM_G_STRING(prog->globaloffsets.worldstatus);
-		if(str && *str)
-		{
-			char *p;
-			const char *q;
-			p = qcstatus;
-			for(q = str; *q && p - qcstatus < (ptrdiff_t)(sizeof(qcstatus)) - 1; ++q)
-				if(*q != '\\' && *q != '\n')
-					*p++ = *q;
-			*p = 0;
-		}
+		char *p;
+		const char *q;
+		p = qcstatus;
+		for(q = str; *q && (size_t)(p - qcstatus) < (sizeof(qcstatus) - 1); ++q)
+			if(*q != '\\' && *q != '\n')
+				*p++ = *q;
+		*p = 0;
 	}
 
 	/// \TODO: we should add more information for the full status string
@@ -2358,6 +2356,8 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg
 				int nameind, cleanind, pingvalue;
 				char curchar;
 				char cleanname [sizeof(cl->name)];
+				const char *str;
+				prvm_edict_t *ed;
 
 				// Remove all characters '"' and '\' in the player name
 				nameind = 0;
@@ -2381,19 +2381,17 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg
 					pingvalue = 0;
 
 				*qcstatus = 0;
-				if(prog->fieldoffsets.clientstatus >= 0)
+				ed = PRVM_EDICT_NUM(i + 1);
+				str = PRVM_GetString(PRVM_serveredictstring(ed, clientstatus));
+				if(str && *str)
 				{
-					const char *str = PRVM_E_STRING(PRVM_EDICT_NUM(i + 1), prog->fieldoffsets.clientstatus);
-					if(str && *str)
-					{
-						char *p;
-						const char *q;
-						p = qcstatus;
-						for(q = str; *q && p != qcstatus + sizeof(qcstatus) - 1; ++q)
-							if(*q != '\\' && *q != '"' && !ISWHITESPACE(*q))
-								*p++ = *q;
-						*p = 0;
-					}
+					char *p;
+					const char *q;
+					p = qcstatus;
+					for(q = str; *q && p != qcstatus + sizeof(qcstatus) - 1; ++q)
+						if(*q != '\\' && *q != '"' && !ISWHITESPACE(*q))
+							*p++ = *q;
+					*p = 0;
 				}
 
 				if ((gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC) && (teamplay.integer > 0))