# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1632674968 14400
#      Sun Sep 26 12:49:28 2021 -0400
# Node ID a5851a9e10adac88804a920acae436403fd6eb66
# Parent  975d77dfebc859e96693babe9cd46ce071695ce7
Fixed a previously locked gameplay/compatibility flag from not being unlocked if it's later redefined in a "GameSettings" block.

diff -r 975d77dfebc8 -r a5851a9e10ad src/gamemode.cpp
--- a/src/gamemode.cpp	Sun Sep 26 12:22:34 2021 -0400
+++ b/src/gamemode.cpp	Sun Sep 26 12:49:28 2021 -0400
@@ -296,6 +296,8 @@
 				// [AK] Lock this flag so it can't be manually changed.
 				if ( bLockFlags )
 					g_GameModes[mode].lFlagsets[flagset][FLAGSET_LOCKEDMASK] |= ulBit;
+				else
+					g_GameModes[mode].lFlagsets[flagset][FLAGSET_LOCKEDMASK] &= ~ulBit;
 			}
 		}
 		else
@@ -311,6 +313,8 @@
 			// [AK] Lock this flag so it can't be manually changed.
 			if ( bLockFlags )
 				g_GameModes[GameMode].lFlagsets[flagset][FLAGSET_LOCKEDMASK] |= ulBit;
+			else
+				g_GameModes[GameMode].lFlagsets[flagset][FLAGSET_LOCKEDMASK] &= ~ulBit;
 		}
 	}
 }