yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-26 14:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix double server entries in multiplayes menu.

Browse source 
Also display netadr in statusbar instead of in the list (lowres compatible).
This commit is contained in:
svdijk 2013-03-24 18:08:06 +01:00
parent 77c9cb7e05
commit 346d9873f0
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/client/menu/menu.c
View file

@ -2394,16 +2394,18 @@ static menuaction_s s_joinserver_server_actions[MAX_LOCAL_SERVERS];
int m_num_servers; int m_num_servers;
#define NO_SERVER_STRING "<no server>" #define NO_SERVER_STRING "<no server>"
/* user readable information */
static char local_server_names[MAX_LOCAL_SERVERS][80];
/* network address */ /* network address */
static netadr_t local_server_netadr[MAX_LOCAL_SERVERS]; static netadr_t local_server_netadr[MAX_LOCAL_SERVERS];
/* user readable information */
static char local_server_names[MAX_LOCAL_SERVERS][80];
static char local_server_netadr_strings[MAX_LOCAL_SERVERS][80];
void void
M_AddToServerList(netadr_t adr, char *info) M_AddToServerList(netadr_t adr, char *info)
{ {
int i; int i;
char *s;
if (m_num_servers == MAX_LOCAL_SERVERS) if (m_num_servers == MAX_LOCAL_SERVERS)
{ {
@ -2415,19 +2417,23 @@ M_AddToServerList(netadr_t adr, char *info)
info++; info++;
} }
s = NET_AdrToString(adr);
/* ignore if duplicated */ /* ignore if duplicated */
for (i = 0; i < m_num_servers; i++) for (i = 0; i < m_num_servers; i++)
{ {
if (!strcmp(info, local_server_names[i])) if (!strcmp(local_server_names[i], info) &&
!strcmp(local_server_netadr_strings[i], s))
{ {
return; return;
} }
} }
local_server_netadr[m_num_servers] = adr; local_server_netadr[m_num_servers] = adr;
Com_sprintf(local_server_names[m_num_servers], strncpy(local_server_names[m_num_servers], info,
sizeof(local_server_names[0]) - 1, sizeof(local_server_names[0])-1);
"%s %s", info, NET_AdrToString(adr)); strncpy(local_server_netadr_strings[m_num_servers], s,
sizeof(local_server_netadr_strings[0])-1);
m_num_servers++; m_num_servers++;
} }
@ -2470,7 +2476,9 @@ SearchLocalGames(void)
for (i = 0; i < MAX_LOCAL_SERVERS; i++) for (i = 0; i < MAX_LOCAL_SERVERS; i++)
{ {
sprintf(local_server_names[i], "%d. %s", i + 1, NO_SERVER_STRING); Com_sprintf(local_server_names[i], sizeof(local_server_names[0])-1,
"%d. %s", i + 1, NO_SERVER_STRING);
local_server_netadr_strings[i][0] = '\0';
} }
M_DrawTextBox(8, 120 - 48, 36, 3); M_DrawTextBox(8, 120 - 48, 36, 3);
@ -2522,14 +2530,13 @@ JoinServer_MenuInit(void)
for (i = 0; i < MAX_LOCAL_SERVERS; i++) for (i = 0; i < MAX_LOCAL_SERVERS; i++)
{ {
s_joinserver_server_actions[i].generic.type = MTYPE_ACTION; s_joinserver_server_actions[i].generic.type = MTYPE_ACTION;
strcpy(local_server_names[i], NO_SERVER_STRING);
s_joinserver_server_actions[i].generic.name = local_server_names[i]; s_joinserver_server_actions[i].generic.name = local_server_names[i];
s_joinserver_server_actions[i].generic.flags = QMF_LEFT_JUSTIFY; s_joinserver_server_actions[i].generic.flags = QMF_LEFT_JUSTIFY;
s_joinserver_server_actions[i].generic.x = 0; s_joinserver_server_actions[i].generic.x = 0;
s_joinserver_server_actions[i].generic.y = 40 + i * 10; s_joinserver_server_actions[i].generic.y = 40 + i * 10;
s_joinserver_server_actions[i].generic.callback = JoinServerFunc; s_joinserver_server_actions[i].generic.callback = JoinServerFunc;
s_joinserver_server_actions[i].generic.statusbar = s_joinserver_server_actions[i].generic.statusbar =
"press ENTER to connect"; local_server_netadr_strings[i];
} }
Menu_AddItem(&s_joinserver_menu, &s_joinserver_address_book_action); Menu_AddItem(&s_joinserver_menu, &s_joinserver_address_book_action);