Commit: 3e3cdba4126d2f94bf7f6d0f016d080d9208a0d6 - zandronum-tspg (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG).

Commit MetaInfo

• Revision: 3e3cdba4126d2f94bf7f6d0f016d080d9208a0d6 (tree)
• Time: 2021-09-27 01:49:28
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Fixed a previously locked gameplay/compatibility flag from not being unlocked if it's later redefined in a "GameSettings" block.

Change Summary

• modified: src/gamemode.cpp

Incremental Difference

diff -r 8e832746f711 -r 3e3cdba4126d 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;
 		}
 	}
 }