From e0a42885d95227af997635282c21c05e0889d5b7 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Mon, 28 Oct 2013 14:36:56 -0500 Subject: [PATCH] Clear more variables in CL_InitServerInfo Have cls.localServers use CL_InitServerInfo. Don't set cls.localServers netType to from.type, it's the wrong value. Note: server->visible is not cleared in CL_InitServerInfo, as stated by a comment below a place where CL_InitServerInfo is used. --- code/client/cl_main.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/code/client/cl_main.c b/code/client/cl_main.c index c03ba61e..5a30a681 100644 --- a/code/client/cl_main.c +++ b/code/client/cl_main.c @@ -2429,6 +2429,9 @@ void CL_InitServerInfo( serverInfo_t *server, netadr_t *address ) { server->game[0] = '\0'; server->gameType = 0; server->netType = 0; + server->punkbuster = 0; + server->g_humanplayers = 0; + server->g_needpass = 0; } #define MAX_SERVERSPERPACKET 256 @@ -3836,21 +3839,8 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) { // add this to the list cls.numlocalservers = i+1; - cls.localServers[i].adr = from; - cls.localServers[i].clients = 0; - cls.localServers[i].hostName[0] = '\0'; - cls.localServers[i].mapName[0] = '\0'; - cls.localServers[i].maxClients = 0; - cls.localServers[i].maxPing = 0; - cls.localServers[i].minPing = 0; - cls.localServers[i].ping = -1; - cls.localServers[i].game[0] = '\0'; - 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; - + CL_InitServerInfo( &cls.localServers[i], &from ); + Q_strncpyz( info, MSG_ReadString( msg ), MAX_INFO_STRING ); if (strlen(info)) { if (info[strlen(info)-1] != '\n') {