提交: 0b2078a75ace719f4c7ac7c6d79750fd961bf5d0 - zandronum-macos-beta (hg)

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

Commit MetaInfo

• 修訂: 0b2078a75ace719f4c7ac7c6d79750fd961bf5d0 (tree)
• 時間: 2022-08-22 23:15:55
• 作者: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Fixed: V_RemoveTrailingCrap couldn't remove a trailing color code that was formatted like "\c[X[[[]".

Change Summary

• modified: src/v_text.cpp

差異

diff -r 87d43eb8bd82 -r 0b2078a75ace src/v_text.cpp
--- a/src/v_text.cpp	Sun Aug 21 23:34:57 2022 -0400
+++ b/src/v_text.cpp	Mon Aug 22 10:15:55 2022 -0400
@@ -774,10 +774,12 @@
 			int i = 0;
 			for ( i = ulStringLength-2; i >= 2; --i )
 			{
-				if ( pszString[i] == '[' )
+				// [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 ) && V_ColorCodeStart ( pszString, i-2 ) )
+			if ( i >= 2 )
 			{
 				pszString[i-2] = 0;
 				ulStringLength = static_cast<ULONG>(strlen( pszString ));