Skip to content
Snippets Groups Projects
Commit 0f5e80a1 authored by sphere's avatar sphere
Browse files

Merge branch 'warpwithoutmapheaderfix' into 'next'

Fix "-warp"ing to a level without a map header crashing the game

Closes #1105

See merge request STJr/SRB2!2143
parents a4a3b5b0 9b5cfe85
No related branches found
No related tags found
2 merge requests!2355fix newer versions of mixerx,!2143Fix "-warp"ing to a level without a map header crashing the game
...@@ -509,7 +509,7 @@ UINT8 M_CampaignWarpIsCheat(INT32 gt, INT32 mapnum, gamedata_t *data) ...@@ -509,7 +509,7 @@ UINT8 M_CampaignWarpIsCheat(INT32 gt, INT32 mapnum, gamedata_t *data)
return true; return true;
} }
if (mapheaderinfo[mapnum-1]->menuflags & LF2_HIDEINMENU) if (!mapheaderinfo[mapnum-1] || mapheaderinfo[mapnum-1]->menuflags & LF2_HIDEINMENU)
{ {
// You're never allowed to warp to this level. // You're never allowed to warp to this level.
return true; return true;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment