Merge branch 'master' into texture_rework

This commit is contained in:
Christoph Oelckers 2020-04-29 08:04:15 +02:00
commit 9be63a5093
14 changed files with 217 additions and 33 deletions

View file

@ -634,8 +634,7 @@ void FLevelLocals::ChangeLevel(const char *levelname, int position, int inflags,
nextlevel = levelname;
}
if (nextSkill != -1)
NextSkill = nextSkill;
NextSkill = (unsigned)nextSkill < AllSkills.Size() ? nextSkill : -1;
if (inflags & CHANGELEVEL_NOINTERMISSION)
{