Permalink
Browse files

- fixed accidentally duplicated variable name in ChangeLevel function.

  • Loading branch information...
coelckers committed Feb 9, 2019
1 parent 244103b commit 59954fa4f9bebfb708d891fc6f031d7a84ea1f22
Showing with 5 additions and 5 deletions.
  1. +5 −5 src/g_level.cpp
@@ -573,7 +573,7 @@ static bool unloading;

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.

@@ -630,7 +630,7 @@ void FLevelLocals::ChangeLevel(const char *levelname, int position, int flags, i
if (nextSkill != -1)
NextSkill = nextSkill;

if (flags & CHANGELEVEL_NOINTERMISSION)
if (inflags & CHANGELEVEL_NOINTERMISSION)
{
flags |= LEVEL_NOINTERMISSION;
}
@@ -647,15 +647,15 @@ void FLevelLocals::ChangeLevel(const char *levelname, int position, int flags, i
{
if (nextinfo->flags2 & LEVEL2_RESETINVENTORY)
{
flags |= CHANGELEVEL_RESETINVENTORY;
inflags |= CHANGELEVEL_RESETINVENTORY;
}
if (nextinfo->flags2 & LEVEL2_RESETHEALTH)
{
flags |= CHANGELEVEL_RESETHEALTH;
inflags |= CHANGELEVEL_RESETHEALTH;
}
}
}
changeflags = flags;
changeflags = inflags;

BotInfo.End(); //Added by MC:

0 comments on commit 59954fa

Please sign in to comment.