From 59954fa4f9bebfb708d891fc6f031d7a84ea1f22 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 9 Feb 2019 12:07:30 +0100 Subject: [PATCH] - fixed accidentally duplicated variable name in ChangeLevel function. --- src/g_level.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/g_level.cpp b/src/g_level.cpp index c490142722..66b4b84f17 100644 --- a/src/g_level.cpp +++ b/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: