Merge branch 'master' into texture_rework
This commit is contained in:
commit
9be63a5093
14 changed files with 217 additions and 33 deletions
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue