NUMGAMETYPES vs gametypecount
This commit is contained in:
parent
86ac94817a
commit
7807424633
|
@ -2114,7 +2114,7 @@ static void CL_ConnectToServer(boolean viams)
|
||||||
UINT8 num = serverlist[i].info.gametype;
|
UINT8 num = serverlist[i].info.gametype;
|
||||||
const char *gametypestr = NULL;
|
const char *gametypestr = NULL;
|
||||||
CONS_Printf(M_GetText("Connecting to: %s\n"), serverlist[i].info.servername);
|
CONS_Printf(M_GetText("Connecting to: %s\n"), serverlist[i].info.servername);
|
||||||
if (num < NUMGAMETYPES)
|
if (num < gametypecount)
|
||||||
gametypestr = Gametype_Names[num];
|
gametypestr = Gametype_Names[num];
|
||||||
if (gametypestr)
|
if (gametypestr)
|
||||||
CONS_Printf(M_GetText("Gametype: %s\n"), gametypestr);
|
CONS_Printf(M_GetText("Gametype: %s\n"), gametypestr);
|
||||||
|
|
|
@ -1409,7 +1409,7 @@ void D_SRB2Main(void)
|
||||||
if (newgametype == -1) // reached end of the list with no match
|
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
|
j = atoi(sgametype); // assume they gave us a gametype number, which is okay too
|
||||||
if (j >= 0 && j < NUMGAMETYPES)
|
if (j >= 0 && j < gametypecount)
|
||||||
newgametype = (INT16)j;
|
newgametype = (INT16)j;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -383,7 +383,7 @@ boolean timedemo_quit;
|
||||||
|
|
||||||
INT16 gametype = GT_COOP;
|
INT16 gametype = GT_COOP;
|
||||||
UINT32 gametyperules = 0;
|
UINT32 gametyperules = 0;
|
||||||
INT16 numgametypes = (GT_CTF + 1);
|
INT16 gametypecount = (GT_CTF + 1);
|
||||||
|
|
||||||
boolean splitscreen = false;
|
boolean splitscreen = false;
|
||||||
boolean circuitmap = false;
|
boolean circuitmap = false;
|
||||||
|
@ -1943,7 +1943,7 @@ static void Command_Map_f(void)
|
||||||
if (isdigit(gametypename[0]))
|
if (isdigit(gametypename[0]))
|
||||||
{
|
{
|
||||||
d = atoi(gametypename);
|
d = atoi(gametypename);
|
||||||
if (d >= 0 && d < NUMGAMETYPES)
|
if (d >= 0 && d < gametypecount)
|
||||||
newgametype = d;
|
newgametype = d;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1951,7 +1951,7 @@ static void Command_Map_f(void)
|
||||||
"Gametype number %d is out of range. Use a number between"
|
"Gametype number %d is out of range. Use a number between"
|
||||||
" 0 and %d inclusive. ...Or just use the name. :v\n",
|
" 0 and %d inclusive. ...Or just use the name. :v\n",
|
||||||
d,
|
d,
|
||||||
NUMGAMETYPES-1);
|
gametypecount-1);
|
||||||
Z_Free(realmapname);
|
Z_Free(realmapname);
|
||||||
Z_Free(mapname);
|
Z_Free(mapname);
|
||||||
return;
|
return;
|
||||||
|
@ -2072,7 +2072,7 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
|
||||||
gametype = READUINT8(*cp);
|
gametype = READUINT8(*cp);
|
||||||
G_SetGametype(gametype); // I fear putting that macro as an argument
|
G_SetGametype(gametype); // I fear putting that macro as an argument
|
||||||
|
|
||||||
if (gametype < 0 || gametype >= NUMGAMETYPES)
|
if (gametype < 0 || gametype >= gametypecount)
|
||||||
gametype = lastgametype;
|
gametype = lastgametype;
|
||||||
else if (gametype != lastgametype)
|
else if (gametype != lastgametype)
|
||||||
D_GameTypeChanged(lastgametype); // emulate consvar_t behavior for gametype
|
D_GameTypeChanged(lastgametype); // emulate consvar_t behavior for gametype
|
||||||
|
@ -3624,7 +3624,7 @@ static void Command_ShowGametype_f(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
// get name string for current gametype
|
// get name string for current gametype
|
||||||
if (gametype >= 0 && gametype < NUMGAMETYPES)
|
if (gametype >= 0 && gametype < gametypecount)
|
||||||
gametypestr = Gametype_Names[gametype];
|
gametypestr = Gametype_Names[gametype];
|
||||||
|
|
||||||
if (gametypestr)
|
if (gametypestr)
|
||||||
|
@ -3891,9 +3891,9 @@ void D_GameTypeChanged(INT32 lastgametype)
|
||||||
{
|
{
|
||||||
const char *oldgt = NULL, *newgt = NULL;
|
const char *oldgt = NULL, *newgt = NULL;
|
||||||
|
|
||||||
if (lastgametype >= 0 && lastgametype < NUMGAMETYPES)
|
if (lastgametype >= 0 && lastgametype < gametypecount)
|
||||||
oldgt = Gametype_Names[lastgametype];
|
oldgt = Gametype_Names[lastgametype];
|
||||||
if (gametype >= 0 && lastgametype < NUMGAMETYPES)
|
if (gametype >= 0 && lastgametype < gametypecount)
|
||||||
newgt = Gametype_Names[gametype];
|
newgt = Gametype_Names[gametype];
|
||||||
|
|
||||||
if (oldgt && newgt)
|
if (oldgt && newgt)
|
||||||
|
|
|
@ -85,7 +85,7 @@ extern boolean multiplayer;
|
||||||
|
|
||||||
extern INT16 gametype;
|
extern INT16 gametype;
|
||||||
extern UINT32 gametyperules;
|
extern UINT32 gametyperules;
|
||||||
extern INT16 numgametypes;
|
extern INT16 gametypecount;
|
||||||
|
|
||||||
extern boolean splitscreen;
|
extern boolean splitscreen;
|
||||||
extern boolean circuitmap; // Does this level have 'circuit mode'?
|
extern boolean circuitmap; // Does this level have 'circuit mode'?
|
||||||
|
|
|
@ -3102,15 +3102,15 @@ void G_SetGametype(INT16 gtype)
|
||||||
INT16 G_NewGametype(UINT32 rules)
|
INT16 G_NewGametype(UINT32 rules)
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
INT16 newgtype = numgametypes;
|
INT16 newgtype = gametypecount;
|
||||||
numgametypes++;
|
gametypecount++;
|
||||||
|
|
||||||
// Set gametype rules.
|
// Set gametype rules.
|
||||||
gametypedefaultrules[newgtype] = numgametypes;
|
gametypedefaultrules[newgtype] = gametypecount;
|
||||||
Gametype_Names[newgtype] = "???";
|
Gametype_Names[newgtype] = "???";
|
||||||
|
|
||||||
// Update gametype_cons_t accordingly.
|
// Update gametype_cons_t accordingly.
|
||||||
for (i = 0; i < numgametypes; i++)
|
for (i = 0; i < gametypecount; i++)
|
||||||
{
|
{
|
||||||
gametype_cons_t[i].value = i;
|
gametype_cons_t[i].value = i;
|
||||||
gametype_cons_t[i].strvalue = Gametype_Names[i];
|
gametype_cons_t[i].strvalue = Gametype_Names[i];
|
||||||
|
|
|
@ -2066,7 +2066,7 @@ static void HU_drawGametype(void)
|
||||||
{
|
{
|
||||||
const char *strvalue = NULL;
|
const char *strvalue = NULL;
|
||||||
|
|
||||||
if (gametype < 0 || gametype >= NUMGAMETYPES)
|
if (gametype < 0 || gametype >= gametypecount)
|
||||||
return; // not a valid gametype???
|
return; // not a valid gametype???
|
||||||
|
|
||||||
strvalue = Gametype_Names[gametype];
|
strvalue = Gametype_Names[gametype];
|
||||||
|
|
|
@ -9932,7 +9932,7 @@ static void M_DrawConnectMenu(void)
|
||||||
va("Ping: %u", (UINT32)LONG(serverlist[slindex].info.time)));
|
va("Ping: %u", (UINT32)LONG(serverlist[slindex].info.time)));
|
||||||
|
|
||||||
gt = "Unknown";
|
gt = "Unknown";
|
||||||
if (serverlist[slindex].info.gametype < NUMGAMETYPES)
|
if (serverlist[slindex].info.gametype < gametypecount)
|
||||||
gt = Gametype_Names[serverlist[slindex].info.gametype];
|
gt = Gametype_Names[serverlist[slindex].info.gametype];
|
||||||
|
|
||||||
V_DrawSmallString(currentMenu->x+46,S_LINEY(i)+8, globalflags,
|
V_DrawSmallString(currentMenu->x+46,S_LINEY(i)+8, globalflags,
|
||||||
|
|
Loading…
Reference in New Issue