X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=netconn.c;h=369014891d05fd49fa3b6428373d0ca58973048d;hb=d2605251ffb2883d5f91c528d2fbac99ff0bd48f;hp=ce127fec5e3527bdd1ea97717e29efa8ee370462;hpb=50f3f558108be1cf9e79f516bfdb257d2b50e2c5;p=xonotic%2Fdarkplaces.git

diff --git a/netconn.c b/netconn.c
index ce127fec..36901489 100755
--- a/netconn.c
+++ b/netconn.c
@@ -1948,9 +1948,10 @@ static void NetConn_BuildChallengeString(char *buffer, int bufferlength)
 // (div0) build the full response only if possible; better a getinfo response than no response at all if getstatus won't fit
 static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg, size_t out_size, qboolean fullstatus)
 {
-	const char *qcstatus = NULL;
+	char qcstatus[256];
 	unsigned int nb_clients = 0, nb_bots = 0, i;
 	int length;
+	char teambuf[3];
 
 	SV_VM_Begin();
 
@@ -1965,6 +1966,7 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg
 		}
 	}
 
+	*qcstatus = 0;
 	if(prog->globaloffsets.worldstatus >= 0)
 	{
 		const char *str = PRVM_G_STRING(prog->globaloffsets.worldstatus);
@@ -1972,9 +1974,9 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg
 		{
 			char *p;
 			const char *q;
-			qcstatus = p = Mem_Alloc(tempmempool, strlen(str) + 1);
+			p = qcstatus;
 			for(q = str; *q; ++q)
-				if(*q != '\\')
+				if(*q != '\\' && *q != '\n')
 					*p++ = *q;
 			*p = 0;
 		}
@@ -1991,16 +1993,10 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg
 						fullstatus ? "statusResponse" : "infoResponse",
 						gamename, com_modname, gameversion.integer, svs.maxclients,
 						nb_clients, nb_bots, sv.name, hostname.string, NET_PROTOCOL_VERSION,
-						qcstatus ? "\\qcstatus\\" : "", qcstatus ? qcstatus : "",
+						*qcstatus ? "\\qcstatus\\" : "", qcstatus,
 						challenge ? "\\challenge\\" : "", challenge ? challenge : "",
 						fullstatus ? "\n" : "");
 
-	if(qcstatus)
-	{
-		Mem_Free((char *)qcstatus);
-		qcstatus = NULL;
-	}
-
 	// Make sure it fits in the buffer
 	if (length < 0)
 		goto bad;
@@ -2038,6 +2034,7 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg
 							break;
 					}
 				} while (curchar != '\0');
+				cleanname[cleanind] = 0; // cleanind is always a valid index even at this point
 
 				pingvalue = (int)(cl->ping * 1000.0f);
 				if(cl->netconnection)
@@ -2045,6 +2042,7 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg
 				else
 					pingvalue = 0;
 
+				*qcstatus = 0;
 				if(prog->fieldoffsets.clientstatus >= 0)
 				{
 					const char *str = PRVM_E_STRING(PRVM_EDICT_NUM(i + 1), prog->fieldoffsets.clientstatus);
@@ -2052,27 +2050,44 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg
 					{
 						char *p;
 						const char *q;
-						qcstatus = p = Mem_Alloc(tempmempool, strlen(str) + 1);
-						for(q = str; *q; ++q)
-							if(*q != '\\' && *q != ' ')
+						p = qcstatus;
+						for(q = str; *q && p != qcstatus + sizeof(qcstatus) - 1; ++q)
+							if(*q != '\\' && *q != '"' && !ISWHITESPACE(*q))
 								*p++ = *q;
 						*p = 0;
 					}
 				}
 
-				if(qcstatus)
+				if ((gamemode == GAME_NEXUIZ) && (teamplay.integer > 0))
 				{
-					length = dpsnprintf(ptr, left, "%s %d \"%s\"\n",
+					if(cl->frags == -666) // spectator
+						strlcpy(teambuf, " 0", sizeof(teambuf));
+					else if(cl->colors == 0x44) // red team
+						strlcpy(teambuf, " 1", sizeof(teambuf));
+					else if(cl->colors == 0xDD) // blue team
+						strlcpy(teambuf, " 2", sizeof(teambuf));
+					else if(cl->colors == 0xCC) // yellow team
+						strlcpy(teambuf, " 3", sizeof(teambuf));
+					else if(cl->colors == 0x99) // pink team
+						strlcpy(teambuf, " 4", sizeof(teambuf));
+					else
+						strlcpy(teambuf, " 0", sizeof(teambuf));
+				}
+				else
+					*teambuf = 0;
+
+				// note: team number is inserted according to SoF2 protocol
+				if(*qcstatus)
+					length = dpsnprintf(ptr, left, "%s %d%s \"%s\"\n",
 										qcstatus,
 										pingvalue,
+										teambuf,
 										cleanname);
-					Mem_Free((char *)qcstatus);
-					qcstatus = NULL;
-				}
 				else
-					length = dpsnprintf(ptr, left, "%d %d \"%s\"\n",
+					length = dpsnprintf(ptr, left, "%d %d%s \"%s\"\n",
 										cl->frags,
 										pingvalue,
+										teambuf,
 										cleanname);
 
 				if(length < 0)