R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tier1: enable CUtlBuffer char conversion

Browse Source 
Changed types to const char* instead of char*.
This commit is contained in:
Kawe Mazidjatari 2024-01-12 00:17:53 +01:00
parent 654da2c816
commit 07cc5420bc
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
r5dev/public/tier1/utlbuffer.h
View File

@ -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;

64
r5dev/tier1/utlbuffer.cpp
View File

@ -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;
}