zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-28 14:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed accidentally duplicated variable name in ChangeLevel function.

Browse source
This commit is contained in:
Christoph Oelckers 2019-02-09 12:07:30 +01:00
parent 244103b42f
commit 59954fa4f9
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/g_level.cpp
View file

@ -573,7 +573,7 @@ static bool unloading;
EXTERN_CVAR(Bool, sv_singleplayerrespawn) EXTERN_CVAR(Bool, sv_singleplayerrespawn)
void FLevelLocals::ChangeLevel(const char *levelname, int position, int flags, int nextSkill) void FLevelLocals::ChangeLevel(const char *levelname, int position, int inflags, int nextSkill)
{ {
if (!isPrimaryLevel()) return; // only the primary level may exit. if (!isPrimaryLevel()) return; // only the primary level may exit.
@ -630,7 +630,7 @@ void FLevelLocals::ChangeLevel(const char *levelname, int position, int flags, i
if (nextSkill != -1) if (nextSkill != -1)
NextSkill = nextSkill; NextSkill = nextSkill;
if (flags & CHANGELEVEL_NOINTERMISSION) if (inflags & CHANGELEVEL_NOINTERMISSION)
{ {
flags |= LEVEL_NOINTERMISSION; flags |= LEVEL_NOINTERMISSION;
} }
@ -647,15 +647,15 @@ void FLevelLocals::ChangeLevel(const char *levelname, int position, int flags, i
{ {
if (nextinfo->flags2 & LEVEL2_RESETINVENTORY) if (nextinfo->flags2 & LEVEL2_RESETINVENTORY)
{ {
flags |= CHANGELEVEL_RESETINVENTORY; inflags |= CHANGELEVEL_RESETINVENTORY;
} }
if (nextinfo->flags2 & LEVEL2_RESETHEALTH) if (nextinfo->flags2 & LEVEL2_RESETHEALTH)
{ {
flags |= CHANGELEVEL_RESETHEALTH; inflags |= CHANGELEVEL_RESETHEALTH;
} }
} }
} }
changeflags = flags; changeflags = inflags;
BotInfo.End(); //Added by MC: BotInfo.End(); //Added by MC: