Merge branch 'gametype-out-of-range' into 'master'
Prevent gametype changes being out of range See merge request STJr/SRB2Internal!503
This commit is contained in:
commit
f13e67bf8f
|
@ -1939,6 +1939,17 @@ static void Command_Map_f(void)
|
||||||
d = atoi(gametypename);
|
d = atoi(gametypename);
|
||||||
if (d >= 0 && d < NUMGAMETYPES)
|
if (d >= 0 && d < NUMGAMETYPES)
|
||||||
newgametype = d;
|
newgametype = d;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
CONS_Alert(CONS_ERROR,
|
||||||
|
"Gametype number %d is out of range. Use a number between"
|
||||||
|
" 0 and %d inclusive. ...Or just use the name. :v\n",
|
||||||
|
d,
|
||||||
|
NUMGAMETYPES-1);
|
||||||
|
Z_Free(realmapname);
|
||||||
|
Z_Free(mapname);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -2054,7 +2065,9 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
|
||||||
lastgametype = gametype;
|
lastgametype = gametype;
|
||||||
gametype = READUINT8(*cp);
|
gametype = READUINT8(*cp);
|
||||||
|
|
||||||
if (gametype != lastgametype)
|
if (gametype < 0 || gametype >= NUMGAMETYPES)
|
||||||
|
gametype = lastgametype;
|
||||||
|
else if (gametype != lastgametype)
|
||||||
D_GameTypeChanged(lastgametype); // emulate consvar_t behavior for gametype
|
D_GameTypeChanged(lastgametype); // emulate consvar_t behavior for gametype
|
||||||
|
|
||||||
skipprecutscene = ((flags & (1<<2)) != 0);
|
skipprecutscene = ((flags & (1<<2)) != 0);
|
||||||
|
|
Loading…
Reference in a new issue