From 281f30c4fd8f6ae2630df8570d81a6780666a714 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Mon, 30 Dec 2019 22:18:55 -0800
Subject: [PATCH] Replace gametype with gametypename in SERVERINFO
PACKETVERSION 1
---
src/d_clisrv.c | 14 +++++++-------
src/d_clisrv.h | 4 ++--
src/m_menu.c | 18 ++++++++++++------
3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index af2be129f..302294557 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1293,7 +1293,8 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers();
netbuffer->u.serverinfo.maxplayer = (UINT8)cv_maxplayers.value;
- netbuffer->u.serverinfo.gametype = (UINT8)gametype;
+ strncpy(netbuffer->u.serverinfo.gametypename, Gametype_Names[gametype],
+ sizeof netbuffer->u.serverinfo.gametypename);
netbuffer->u.serverinfo.modifiedgame = (UINT8)modifiedgame;
netbuffer->u.serverinfo.cheatsenabled = CV_CheatsEnabled();
netbuffer->u.serverinfo.isdedicated = (UINT8)dedicated;
@@ -2122,13 +2123,10 @@ static void CL_ConnectToServer(boolean viams)
if (i != -1)
{
- UINT16 num = serverlist[i].info.gametype;
- const char *gametypestr = NULL;
+ char *gametypestr = serverlist[i].info.gametypename;
CONS_Printf(M_GetText("Connecting to: %s\n"), serverlist[i].info.servername);
- if (num < gametypecount)
- gametypestr = Gametype_Names[num];
- if (gametypestr)
- CONS_Printf(M_GetText("Gametype: %s\n"), gametypestr);
+ gametypestr[sizeof serverlist[i].info.gametypename - 1] = '\0';
+ CONS_Printf(M_GetText("Gametype: %s\n"), gametypestr);
CONS_Printf(M_GetText("Version: %d.%d.%u\n"), serverlist[i].info.version/100,
serverlist[i].info.version%100, serverlist[i].info.subversion);
}
@@ -3656,6 +3654,8 @@ static void HandleServerInfo(SINT8 node)
netbuffer->u.serverinfo.servername[MAXSERVERNAME-1] = 0;
netbuffer->u.serverinfo.application
[sizeof netbuffer->u.serverinfo.application - 1] = '\0';
+ netbuffer->u.serverinfo.gametypename
+ [sizeof netbuffer->u.serverinfo.gametypename - 1] = '\0';
SL_InsertServer(&netbuffer->u.serverinfo, node);
}
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 49f8afc76..c797e5ca8 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -27,7 +27,7 @@ This version is independent of the mod name, and standard
version and subversion. It should only account for the
basic fields of the packet, and change infrequently.
*/
-#define PACKETVERSION 0
+#define PACKETVERSION 1
// Network play related stuff.
// There is a data struct that stores network
@@ -361,7 +361,7 @@ typedef struct
UINT8 subversion;
UINT8 numberofplayer;
UINT8 maxplayer;
- UINT8 gametype;
+ char gametypename[24];
UINT8 modifiedgame;
UINT8 cheatsenabled;
UINT8 isdedicated;
diff --git a/src/m_menu.c b/src/m_menu.c
index 6ef9a5e19..a199b0ae3 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -9971,7 +9971,7 @@ static void M_DrawRoomMenu(void)
static void M_DrawConnectMenu(void)
{
UINT16 i;
- const char *gt = "Unknown";
+ char *gt;
INT32 numPages = (serverlistcount+(SERVERS_PER_PAGE-1))/SERVERS_PER_PAGE;
for (i = FIRSTSERVERLINE; i < min(localservercount, SERVERS_PER_PAGE)+FIRSTSERVERLINE; i++)
@@ -10015,9 +10015,7 @@ static void M_DrawConnectMenu(void)
V_DrawSmallString(currentMenu->x, S_LINEY(i)+8, globalflags,
va("Ping: %u", (UINT32)LONG(serverlist[slindex].info.time)));
- gt = "Unknown";
- if (serverlist[slindex].info.gametype < gametypecount)
- gt = Gametype_Names[serverlist[slindex].info.gametype];
+ gt = serverlist[slindex].info.gametypename;
V_DrawSmallString(currentMenu->x+46,S_LINEY(i)+8, globalflags,
va("Players: %02d/%02d", serverlist[slindex].info.numberofplayer, serverlist[slindex].info.maxplayer));
@@ -10063,7 +10061,15 @@ SERVER_LIST_ENTRY_COMPARATOR(time)
SERVER_LIST_ENTRY_COMPARATOR(numberofplayer)
SERVER_LIST_ENTRY_COMPARATOR_REVERSE(numberofplayer)
SERVER_LIST_ENTRY_COMPARATOR_REVERSE(maxplayer)
-SERVER_LIST_ENTRY_COMPARATOR(gametype)
+
+static int ServerListEntryComparator_gametypename(const void *entry1, const void *entry2)
+{
+ const serverelem_t *sa = (const serverelem_t*)entry1, *sb = (const serverelem_t*)entry2;
+ int c;
+ if (( c = strcasecmp(sa->info.gametypename, sb->info.gametypename) ))
+ return c;
+ return strcmp(sa->info.servername, sb->info.servername); \
+}
// Special one for modified state.
static int ServerListEntryComparator_modified(const void *entry1, const void *entry2)
@@ -10103,7 +10109,7 @@ void M_SortServerList(void)
qsort(serverlist, serverlistcount, sizeof(serverelem_t), ServerListEntryComparator_maxplayer_reverse);
break;
case 5: // Gametype.
- qsort(serverlist, serverlistcount, sizeof(serverelem_t), ServerListEntryComparator_gametype);
+ qsort(serverlist, serverlistcount, sizeof(serverelem_t), ServerListEntryComparator_gametypename);
break;
}
#endif