diff --git a/src/d_netcmd.c b/src/d_netcmd.c index c46fdc475..a758256d9 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -2671,15 +2671,21 @@ static void Command_Map_f(void) if (!gametype_cons_t[i].strvalue) // reached end of the list with no match { - d = atoi(gametypename); - // assume they gave us a gametype number, which is okay too - for (i = 0; gametype_cons_t[i].strvalue != NULL; i++) + /* Did they give us a gametype number? That's okay too! */ + if (isdigit(gametypename[0])) { - if (d == gametype_cons_t[i].value) - { - newgametype = gametype_cons_t[i].value; - break; - } + d = atoi(gametypename); + if (d >= 0 && d < NUMGAMETYPES) + newgametype = d; + } + else + { + CONS_Alert(CONS_ERROR, + "'%s' is not a gametype.\n", + gametypename); + Z_Free(realmapname); + Z_Free(mapname); + return; } } }