From 07cc5420bc439412d44688ea03640d61b04dd7f6 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Fri, 12 Jan 2024 00:17:53 +0100
Subject: [PATCH] Tier1: enable CUtlBuffer char conversion

Changed types to const char* instead of char*.
---
 r5dev/public/tier1/utlbuffer.h |  4 +--
 r5dev/tier1/utlbuffer.cpp      | 64 +++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/r5dev/public/tier1/utlbuffer.h b/r5dev/public/tier1/utlbuffer.h
index c14f2926..3c4d7c35 100644
--- a/r5dev/public/tier1/utlbuffer.h
+++ b/r5dev/public/tier1/utlbuffer.h
@@ -41,7 +41,7 @@ public:
 	struct ConversionArray_t
 	{
 		char m_nActualChar;
-		char* m_pReplacementString;
+		const char* m_pReplacementString;
 	};
 
 	CUtlCharConversion(char nEscapeChar, const char* pDelimiter, ssize_t nCount, ConversionArray_t* pArray);
@@ -60,7 +60,7 @@ protected:
 	struct ConversionInfo_t
 	{
 		ssize_t m_nLength;
-		char* m_pReplacementString;
+		const char* m_pReplacementString;
 	};
 
 	char m_nEscapeChar;
diff --git a/r5dev/tier1/utlbuffer.cpp b/r5dev/tier1/utlbuffer.cpp
index 4c0f18f7..2db5b505 100644
--- a/r5dev/tier1/utlbuffer.cpp
+++ b/r5dev/tier1/utlbuffer.cpp
@@ -49,37 +49,37 @@ public:
 //-----------------------------------------------------------------------------
 // List of character conversions
 //-----------------------------------------------------------------------------
-//BEGIN_CUSTOM_CHAR_CONVERSION(CUtlCStringConversion, s_StringCharConversion, "\"", '\\')
-//{
-//	'\n', "n"
-//},
-//	{ '\t', "t" },
-//	{ '\v', "v" },
-//	{ '\b', "b" },
-//	{ '\r', "r" },
-//	{ '\f', "f" },
-//	{ '\a', "a" },
-//	{ '\\', "\\" },
-//	{ '\?', "\?" },
-//	{ '\'', "\'" },
-//	{ '\"', "\"" },
-//END_CUSTOM_CHAR_CONVERSION(CUtlCStringConversion, s_StringCharConversion, "\"", '\\')
-//
-//CUtlCharConversion* GetCStringCharConversion()
-//{
-//	return &s_StringCharConversion;
-//}
-//
-//BEGIN_CUSTOM_CHAR_CONVERSION(CUtlNoEscConversion, s_NoEscConversion, "\"", 0x7F)
-//{
-//	0x7F, ""
-//},
-//END_CUSTOM_CHAR_CONVERSION(CUtlNoEscConversion, s_NoEscConversion, "\"", 0x7F)
-//
-//CUtlCharConversion* GetNoEscCharConversion()
-//{
-//	return &s_NoEscConversion;
-//}
+BEGIN_CUSTOM_CHAR_CONVERSION(CUtlCStringConversion, s_StringCharConversion, "\"", '\\')
+{
+	'\n', "n"
+},
+	{ '\t', "t" },
+	{ '\v', "v" },
+	{ '\b', "b" },
+	{ '\r', "r" },
+	{ '\f', "f" },
+	{ '\a', "a" },
+	{ '\\', "\\" },
+	{ '\?', "\?" },
+	{ '\'', "\'" },
+	{ '\"', "\"" },
+END_CUSTOM_CHAR_CONVERSION(CUtlCStringConversion, s_StringCharConversion, "\"", '\\')
+
+CUtlCharConversion* GetCStringCharConversion()
+{
+	return &s_StringCharConversion;
+}
+
+BEGIN_CUSTOM_CHAR_CONVERSION(CUtlNoEscConversion, s_NoEscConversion, "\"", 0x7F)
+{
+	0x7F, ""
+},
+END_CUSTOM_CHAR_CONVERSION(CUtlNoEscConversion, s_NoEscConversion, "\"", 0x7F)
+
+CUtlCharConversion* GetNoEscCharConversion()
+{
+	return &s_NoEscConversion;
+}
 
 
 //-----------------------------------------------------------------------------
@@ -98,7 +98,7 @@ CUtlCStringConversion::CUtlCStringConversion(char nEscapeChar, const char* pDeli
 // Finds a conversion for the passed-in string, returns length
 char CUtlCStringConversion::FindConversion(const char* pString, ssize_t* pLength)
 {
-	char c = m_pConversion[(unsigned char)(pString[0])];
+	const char c = m_pConversion[(unsigned char)(pString[0])];
 	*pLength = (c != '\0') ? 1 : 0;
 	return c;
 }