Commit: 054a305d9f6b7772f60c9ba0a1507effd91af0e2 - zandronum-cluster (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG), Euroboros (EB), and Down Under Doomers (DUD).

Commit MetaInfo

• Révision: 054a305d9f6b7772f60c9ba0a1507effd91af0e2 (tree)
• l'heure: 2023-07-12 01:37:31
• Auteur: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Message de Log

Fixed: strings with "\c[X]x]" at the end were still being treated as a trailing color code.

Change Summary

• modified: src/v_text.cpp

Modification

diff -r 89bccf7127ba -r 054a305d9f6b src/v_text.cpp
--- a/src/v_text.cpp	Sun Jul 09 15:14:38 2023 -0400
+++ b/src/v_text.cpp	Tue Jul 11 12:37:31 2023 -0400
@@ -709,19 +709,24 @@
 		// [BB] Remove trailing color code of type "\c[X]".
 		else if ( pszString[ulStringLength-1] == ']' )
 		{
-			// [AK] "\c[X]]" is not a trailing color code.
-			if ( ( ulStringLength > 2 ) && ( pszString[ulStringLength-2] == ']' ) )
-				break;
+			bool bHitClosingBracket = false;
+			int i = 0;
 
-			int i = 0;
 			for ( i = ulStringLength-2; i >= 2; --i )
 			{
+				// [AK] If we hit another ']' (e.g. "\c[X]]"), then it's not a trailing color code.
+				if ( pszString[i] == ']' )
+				{
+					bHitClosingBracket = true;
+					break;
+				}
+
 				// [AK] We should keep checking for "\c[" until we reach the beginning of the string,
 				// in case the string contains something like "\c[X[[[]".
 				if ( ( pszString[i] == '[' ) && V_ColorCodeStart ( pszString, i-2 ) )
 					break;
 			}
-			if ( i >= 2 )
+			if ( ( bHitClosingBracket == false ) && ( i >= 2  ) )
 			{
 				pszString[i-2] = 0;
 				ulStringLength = static_cast<ULONG>(strlen( pszString ));