diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index a0f9f40ab6b10d583a116e1fa2a1d7e85b898300..31fec14facf36bf95a72f5abc89c0219816c27b7 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2056,17 +2056,11 @@ static void CL_ConnectToServer(boolean viams)
if (i != -1)
{
- INT32 j;
+ UINT8 num = serverlist[i].info.gametype;
const char *gametypestr = NULL;
CONS_Printf(M_GetText("Connecting to: %s\n"), serverlist[i].info.servername);
- for (j = 0; gametype_cons_t[j].strvalue; j++)
- {
- if (gametype_cons_t[j].value == serverlist[i].info.gametype)
- {
- gametypestr = gametype_cons_t[j].strvalue;
- break;
- }
- }
+ if (num < NUMGAMETYPES)
+ gametypestr = Gametype_Names[num];
if (gametypestr)
CONS_Printf(M_GetText("Gametype: %s\n"), gametypestr);
CONS_Printf(M_GetText("Version: %d.%d.%u\n"), serverlist[i].info.version/100,
diff --git a/src/d_main.c b/src/d_main.c
index 1782e94f579db209a267e50e2554a254f8f0eb9c..527031fa81241535b184bdf49816de47ac96f095 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1362,13 +1362,9 @@ void D_SRB2Main(void)
INT16 newgametype = -1;
const char *sgametype = M_GetNextParm();
- for (j = 0; gametype_cons_t[j].strvalue; j++)
- if (!strcasecmp(gametype_cons_t[j].strvalue, sgametype))
- {
- newgametype = (INT16)gametype_cons_t[j].value;
- break;
- }
- if (!gametype_cons_t[j].strvalue) // reached end of the list with no match
+ newgametype = G_GetGametypeByName(sgametype);
+
+ if (newgametype == -1) // reached end of the list with no match
{
j = atoi(sgametype); // assume they gave us a gametype number, which is okay too
if (j >= 0 && j < NUMGAMETYPES)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 11b9413a82905cf1e9066a72d4848b44e14d32d8..71ec55de296edfa83816d585230b3ca8af149f4e 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -409,6 +409,16 @@ const char *netxcmdnames[MAXNETXCMD - 1] =
*/
void D_RegisterServerCommands(void)
{
+ INT32 i;
+
+ for (i = 0; i < NUMGAMETYPES; i++)
+ {
+ gametype_cons_t[i].value = i;
+ gametype_cons_t[i].strvalue = Gametype_Names[i];
+ }
+ gametype_cons_t[NUMGAMETYPES].value = 0;
+ gametype_cons_t[NUMGAMETYPES].strvalue = NULL;
+
RegisterNetXCmd(XD_NAMEANDCOLOR, Got_NameAndColor);
RegisterNetXCmd(XD_WEAPONPREF, Got_WeaponPref);
RegisterNetXCmd(XD_MAP, Got_Mapcmd);
@@ -1639,7 +1649,7 @@ static void Command_Map_f(void)
{
const char *mapname;
size_t i;
- INT32 j, newmapnum;
+ INT32 newmapnum;
boolean newresetplayers;
INT32 newgametype = gametype;
@@ -1707,27 +1717,13 @@ static void Command_Map_f(void)
return;
}
- for (j = 0; gametype_cons_t[j].strvalue; j++)
- if (!strcasecmp(gametype_cons_t[j].strvalue, COM_Argv(i+1)))
- {
- // Don't do any variable setting here. Wait until you get your
- // map packet first to avoid sending the same info twice!
- newgametype = gametype_cons_t[j].value;
-
- break;
- }
+ newgametype = G_GetGametypeByName(COM_Argv(i+1));
- if (!gametype_cons_t[j].strvalue) // reached end of the list with no match
+ if (newgametype == -1) // reached end of the list with no match
{
- // assume they gave us a gametype number, which is okay too
- for (j = 0; gametype_cons_t[j].strvalue != NULL; j++)
- {
- if (atoi(COM_Argv(i+1)) == gametype_cons_t[j].value)
- {
- newgametype = gametype_cons_t[j].value;
- break;
- }
- }
+ INT32 j = atoi(COM_Argv(i+1)); // assume they gave us a gametype number, which is okay too
+ if (j >= 0 && j < NUMGAMETYPES)
+ newgametype = (INT16)j;
}
}
@@ -1742,12 +1738,11 @@ static void Command_Map_f(void)
char gametypestring[32] = "Single Player";
if (multiplayer)
- for (i = 0; gametype_cons_t[i].strvalue != NULL; i++)
- if (gametype_cons_t[i].value == newgametype)
- {
- strcpy(gametypestring, gametype_cons_t[i].strvalue);
- break;
- }
+ {
+ if (newgametype >= 0 && newgametype < NUMGAMETYPES
+ && Gametype_Names[newgametype])
+ strcpy(gametypestring, Gametype_Names[newgametype]);
+ }
CONS_Alert(CONS_WARNING, M_GetText("%s doesn't support %s mode!\n(Use -force to override)\n"), mapname, gametypestring);
return;
@@ -3486,7 +3481,6 @@ static void Command_ModDetails_f(void)
//
static void Command_ShowGametype_f(void)
{
- INT32 j;
const char *gametypestr = NULL;
if (!(netgame || multiplayer)) // print "Single player" instead of "Co-op"
@@ -3494,15 +3488,11 @@ static void Command_ShowGametype_f(void)
CONS_Printf(M_GetText("Current gametype is %s\n"), M_GetText("Single player"));
return;
}
- // find name string for current gametype
- for (j = 0; gametype_cons_t[j].strvalue; j++)
- {
- if (gametype_cons_t[j].value == gametype)
- {
- gametypestr = gametype_cons_t[j].strvalue;
- break;
- }
- }
+
+ // get name string for current gametype
+ if (gametype >= 0 && gametype < NUMGAMETYPES)
+ gametypestr = Gametype_Names[gametype];
+
if (gametypestr)
CONS_Printf(M_GetText("Current gametype is %s\n"), gametypestr);
else // string for current gametype was not found above (should never happen)
@@ -3644,15 +3634,13 @@ void D_GameTypeChanged(INT32 lastgametype)
{
if (netgame)
{
- INT32 j;
const char *oldgt = NULL, *newgt = NULL;
- for (j = 0; gametype_cons_t[j].strvalue; j++)
- {
- if (gametype_cons_t[j].value == lastgametype)
- oldgt = gametype_cons_t[j].strvalue;
- if (gametype_cons_t[j].value == gametype)
- newgt = gametype_cons_t[j].strvalue;
- }
+
+ if (lastgametype >= 0 && lastgametype < NUMGAMETYPES)
+ oldgt = Gametype_Names[lastgametype];
+ if (gametype >= 0 && lastgametype < NUMGAMETYPES)
+ newgt = Gametype_Names[gametype];
+
if (oldgt && newgt)
CONS_Printf(M_GetText("Gametype was changed from %s to %s\n"), oldgt, newgt);
}
diff --git a/src/doomstat.h b/src/doomstat.h
index d9132798ffa33b6420e03fd37d575b500763c2ba..8050a1beb2562d50dc63fb1c1e5a753602225486 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -318,7 +318,10 @@ enum GameType
NUMGAMETYPES
};
-// If you alter this list, update gametype_cons_t in m_menu.c
+// If you alter this list, update dehacked.c, and Gametype_Names in g_game.c
+
+// String names for gametypes
+extern const char *Gametype_Names[NUMGAMETYPES];
extern tic_t totalplaytime;
diff --git a/src/g_game.c b/src/g_game.c
index c0cb469a1d63a7070669c002a649c7af6da2079c..f9477f91e08f39d54e25989c076266c0cb844dab 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2698,6 +2698,38 @@ void G_ExitLevel(void)
}
}
+// See also the enum GameType in doomstat.h
+const char *Gametype_Names[NUMGAMETYPES] =
+{
+ "Co-op", // GT_COOP
+ "Competition", // GT_COMPETITION
+ "Race", // GT_RACE
+
+ "Match", // GT_MATCH
+ "Team Match", // GT_TEAMMATCH
+
+ "Tag", // GT_TAG
+ "Hide and Seek", // GT_HIDEANDSEEK
+
+ "CTF" // GT_CTF
+};
+
+//
+// G_GetGametypeByName
+//
+// Returns the number for the given gametype name string, or -1 if not valid.
+//
+INT32 G_GetGametypeByName(const char *gametypestr)
+{
+ INT32 i;
+
+ for (i = 0; i < NUMGAMETYPES; i++)
+ if (!stricmp(gametypestr, Gametype_Names[i]))
+ return i;
+
+ return -1; // unknown gametype
+}
+
//
// G_IsSpecialStage
//
diff --git a/src/g_game.h b/src/g_game.h
index 5259eacbbf4848ab208e3290b04ffd308fbdaa14..87ddb3103d73f2cc222794bff1e0f993c6610154 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -163,6 +163,7 @@ ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void);
void G_StopDemo(void);
boolean G_CheckDemoStatus(void);
+INT32 G_GetGametypeByName(const char *gametypestr);
boolean G_IsSpecialStage(INT32 mapnum);
boolean G_GametypeUsesLives(void);
boolean G_GametypeHasTeams(void);
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index e34e5c35c620a4f49161973b2d44eb439e791bfd..f624e39de4cef32e0935b702a5380007a3f2f18c 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -1952,19 +1952,17 @@ static void HU_DrawCEcho(void)
static void HU_drawGametype(void)
{
- INT32 i = 0;
+ const char *strvalue = NULL;
- for (i = 0; gametype_cons_t[i].strvalue; i++)
- {
- if (gametype_cons_t[i].value == gametype)
- {
- if (splitscreen)
- V_DrawString(4, 184, 0, gametype_cons_t[i].strvalue);
- else
- V_DrawString(4, 192, 0, gametype_cons_t[i].strvalue);
- return;
- }
- }
+ if (gametype < 0 || gametype >= NUMGAMETYPES)
+ return; // not a valid gametype???
+
+ strvalue = Gametype_Names[gametype];
+
+ if (splitscreen)
+ V_DrawString(4, 184, 0, strvalue);
+ else
+ V_DrawString(4, 192, 0, strvalue);
}
//
diff --git a/src/m_menu.c b/src/m_menu.c
index 65647d2a6feaf3d4177180bab07af58d12e433d6..a833ace21a56d2286af516fef7b427644a6ba9f2 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -347,23 +347,9 @@ static CV_PossibleValue_t skins_cons_t[MAXSKINS+1] = {{1, DEFAULTSKIN}};
consvar_t cv_chooseskin = {"chooseskin", DEFAULTSKIN, CV_HIDEN|CV_CALL, skins_cons_t, Nextmap_OnChange, 0, NULL, NULL, 0, 0, NULL};
// This gametype list is integral for many different reasons.
-// When you add gametypes here, don't forget to update them in CV_AddValue!
-CV_PossibleValue_t gametype_cons_t[] =
-{
- {GT_COOP, "Co-op"},
-
- {GT_COMPETITION, "Competition"},
- {GT_RACE, "Race"},
-
- {GT_MATCH, "Match"},
- {GT_TEAMMATCH, "Team Match"},
-
- {GT_TAG, "Tag"},
- {GT_HIDEANDSEEK, "Hide and Seek"},
+// When you add gametypes here, don't forget to update them in dehacked.c and doomstat.h!
+CV_PossibleValue_t gametype_cons_t[NUMGAMETYPES+1];
- {GT_CTF, "CTF"},
- {0, NULL}
-};
consvar_t cv_newgametype = {"newgametype", "Co-op", CV_HIDEN|CV_CALL, gametype_cons_t, Newgametype_OnChange, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t serversort_cons_t[] = {
@@ -6545,7 +6531,7 @@ static void M_DrawRoomMenu(void)
static void M_DrawConnectMenu(void)
{
- UINT16 i, j;
+ UINT16 i;
const char *gt = "Unknown";
INT32 numPages = (serverlistcount+(SERVERS_PER_PAGE-1))/SERVERS_PER_PAGE;
@@ -6591,11 +6577,8 @@ static void M_DrawConnectMenu(void)
va("Ping: %u", (UINT32)LONG(serverlist[slindex].info.time)));
gt = "Unknown";
- for (j = 0; gametype_cons_t[j].strvalue; j++)
- {
- if (gametype_cons_t[j].value == serverlist[slindex].info.gametype)
- gt = gametype_cons_t[j].strvalue;
- }
+ if (serverlist[slindex].info.gametype < NUMGAMETYPES)
+ gt = Gametype_Names[serverlist[slindex].info.gametype];
V_DrawSmallString(currentMenu->x+46,S_LINEY(i)+8, globalflags,
va("Players: %02d/%02d", serverlist[slindex].info.numberofplayer, serverlist[slindex].info.maxplayer));