Commit: 8cd9d65c2c3f8c17e9b1dcd2b81e8df89f0e6ab8 - zandronum-macos-beta (hg)

This is a fork of Zandronum Beta for Mac Os (Silicon and Intel)

Commit MetaInfo

• Revisão: 8cd9d65c2c3f8c17e9b1dcd2b81e8df89f0e6ab8 (tree)
• Hora: 2022-12-15 23:43:36
• Autor: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Mensagem de Log

Fixed: when the server printed a list of flags that were changed, it didn't check if a flag CVar existed first before incrementing the number of flags changed (e.g. "dmflags2 1" doesn't enable any flags because no flag CVar occupies the first bit of dmflags2).

Mudança Sumário

• modified: docs/zandronum-history.txt
• modified: src/sv_main.cpp

Diff

diff -r 3d1dc73737a3 -r 8cd9d65c2c3f docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Thu Dec 15 09:21:49 2022 -0500
+++ b/docs/zandronum-history.txt	Thu Dec 15 09:43:36 2022 -0500
@@ -85,6 +85,7 @@
 -	- Fixed: the server didn't always update the correct flagset (e.g. dmflags, compatflags, lmsspectatorsettings) to the clients. [Kaminsky]
 -	- Fixed: the server would still print which flags have changed for lmsallowedweapons when the current game mode wasn't (T)LMS. [Kaminsky]
 -	- Fixed: Every client's ping would be stuck at zero on a Linux server that was running for more than 24 consecutive days. [Kaminsky]
+-	- Fixed: when the server printed a list of flags that were changed, it didn't check if a flag CVar existed first before incrementing the number of flags changed (e.g. "dmflags2 1" doesn't enable any flags because no flag CVar occupies the first bit of dmflags2). [Kaminsky]
 !	- The result value of GAMEEVENT_MEDALS event scripts can now be used to determine whether or not the player receives the medal. [Kaminsky]
 !	- GAMEMODE flags are now validated after all GAMEMODE lumps have been parsed instead of after each one. The internal game mode name (e.g. "TeamLMS") is now printed with the error message instead of the actual name. [Kaminsky]
 !	- Added an extra check to ensure that game modes have a (short) name. [Kaminsky]

diff -r 3d1dc73737a3 -r 8cd9d65c2c3f src/sv_main.cpp
--- a/src/sv_main.cpp	Thu Dec 15 09:21:49 2022 -0500
+++ b/src/sv_main.cpp	Thu Dec 15 09:43:36 2022 -0500
@@ -4437,26 +4437,27 @@
 		if ((( value ^ oldValue ) & bit ) == 0 )
 			continue;
 
-		// [AK] Print the name of the CVar and its new value while we still can.
-		if ( ++flagsChanged <= maxflags )
-		{
-			for ( FBaseCVar* cvar = CVars; cvar; cvar = cvar->GetNext( ) )
+		for ( FBaseCVar* cvar = CVars; cvar; cvar = cvar->GetNext( ))
+		{
+			// [AK] Make sure that this CVar is a flag.
+			if ( cvar->IsFlagCVar( ) == false )
+				continue;
+
+			FFlagCVar* flagCVar = static_cast<FFlagCVar*>( cvar );
+
+			// [AK] Check if this CVar belongs to the flagset and matches the corresponding bit.
+			if (( flagCVar->GetValueVar( ) == &flagset ) && ( flagCVar->GetBitVal( ) == bit ))
 			{
-				// [AK] Make sure that this CVar is a flag.
-				if ( cvar->IsFlagCVar( ) == false )
-					continue;
-
-				FFlagCVar* flagCVar = static_cast<FFlagCVar*>( cvar );
-
-				// [AK] Check if this CVar belongs to the flagset and matches the corresponding bit.
-				if (( flagCVar->GetValueVar( ) == &flagset ) && ( flagCVar->GetBitVal( ) == bit ))
+				// [AK] Print the name of the CVar and its new value while we still can.
+				if ( ++flagsChanged <= maxflags )
 				{
 					if ( flagsChanged > 1 )
 						result += ", ";
 
 					result.AppendFormat( "%s %s", flagCVar->GetName( ), ( value & bit ) ? "ON" : "OFF" );
-					break;
 				}
+
+				break;
 			}
 		}
 	}