Move map loaded failure error from the deleted backwards compat code

This commit is contained in:
TehRealSalt 2019-10-02 12:07:37 -04:00
parent 217f61897f
commit 7433becd7a

View file

@ -4914,7 +4914,6 @@ void G_ReadDemoExtraData(void)
kartspeed = READUINT8(demo_p);
kartweight = READUINT8(demo_p);
if (stricmp(skins[players[p].skin].name, name) != 0)
FindClosestSkinForStats(p, kartspeed, kartweight);
@ -7198,6 +7197,19 @@ void G_DoPlayDemo(char *defdemoname)
randseed = READUINT32(demo_p);
demo_p += 4; // Extrainfo location
// ...*map* not loaded?
if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1] || !(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK))
{
snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
CONS_Alert(CONS_ERROR, "%s", msg);
M_StartMessage(msg, NULL, MM_NOTHING);
Z_Free(pdemoname);
Z_Free(demobuffer);
demo.playback = false;
demo.title = false;
return;
}
// net var data
CV_LoadNetVars(&demo_p);