mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
Tier1: enable CUtlBuffer char conversion
Changed types to const char* instead of char*.
This commit is contained in:
parent
654da2c816
commit
07cc5420bc
@ -41,7 +41,7 @@ public:
|
|||||||
struct ConversionArray_t
|
struct ConversionArray_t
|
||||||
{
|
{
|
||||||
char m_nActualChar;
|
char m_nActualChar;
|
||||||
char* m_pReplacementString;
|
const char* m_pReplacementString;
|
||||||
};
|
};
|
||||||
|
|
||||||
CUtlCharConversion(char nEscapeChar, const char* pDelimiter, ssize_t nCount, ConversionArray_t* pArray);
|
CUtlCharConversion(char nEscapeChar, const char* pDelimiter, ssize_t nCount, ConversionArray_t* pArray);
|
||||||
@ -60,7 +60,7 @@ protected:
|
|||||||
struct ConversionInfo_t
|
struct ConversionInfo_t
|
||||||
{
|
{
|
||||||
ssize_t m_nLength;
|
ssize_t m_nLength;
|
||||||
char* m_pReplacementString;
|
const char* m_pReplacementString;
|
||||||
};
|
};
|
||||||
|
|
||||||
char m_nEscapeChar;
|
char m_nEscapeChar;
|
||||||
|
@ -49,37 +49,37 @@ public:
|
|||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// List of character conversions
|
// List of character conversions
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
//BEGIN_CUSTOM_CHAR_CONVERSION(CUtlCStringConversion, s_StringCharConversion, "\"", '\\')
|
BEGIN_CUSTOM_CHAR_CONVERSION(CUtlCStringConversion, s_StringCharConversion, "\"", '\\')
|
||||||
//{
|
{
|
||||||
// '\n', "n"
|
'\n', "n"
|
||||||
//},
|
},
|
||||||
// { '\t', "t" },
|
{ '\t', "t" },
|
||||||
// { '\v', "v" },
|
{ '\v', "v" },
|
||||||
// { '\b', "b" },
|
{ '\b', "b" },
|
||||||
// { '\r', "r" },
|
{ '\r', "r" },
|
||||||
// { '\f', "f" },
|
{ '\f', "f" },
|
||||||
// { '\a', "a" },
|
{ '\a', "a" },
|
||||||
// { '\\', "\\" },
|
{ '\\', "\\" },
|
||||||
// { '\?', "\?" },
|
{ '\?', "\?" },
|
||||||
// { '\'', "\'" },
|
{ '\'', "\'" },
|
||||||
// { '\"', "\"" },
|
{ '\"', "\"" },
|
||||||
//END_CUSTOM_CHAR_CONVERSION(CUtlCStringConversion, s_StringCharConversion, "\"", '\\')
|
END_CUSTOM_CHAR_CONVERSION(CUtlCStringConversion, s_StringCharConversion, "\"", '\\')
|
||||||
//
|
|
||||||
//CUtlCharConversion* GetCStringCharConversion()
|
CUtlCharConversion* GetCStringCharConversion()
|
||||||
//{
|
{
|
||||||
// return &s_StringCharConversion;
|
return &s_StringCharConversion;
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//BEGIN_CUSTOM_CHAR_CONVERSION(CUtlNoEscConversion, s_NoEscConversion, "\"", 0x7F)
|
BEGIN_CUSTOM_CHAR_CONVERSION(CUtlNoEscConversion, s_NoEscConversion, "\"", 0x7F)
|
||||||
//{
|
{
|
||||||
// 0x7F, ""
|
0x7F, ""
|
||||||
//},
|
},
|
||||||
//END_CUSTOM_CHAR_CONVERSION(CUtlNoEscConversion, s_NoEscConversion, "\"", 0x7F)
|
END_CUSTOM_CHAR_CONVERSION(CUtlNoEscConversion, s_NoEscConversion, "\"", 0x7F)
|
||||||
//
|
|
||||||
//CUtlCharConversion* GetNoEscCharConversion()
|
CUtlCharConversion* GetNoEscCharConversion()
|
||||||
//{
|
{
|
||||||
// return &s_NoEscConversion;
|
return &s_NoEscConversion;
|
||||||
//}
|
}
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
@ -98,7 +98,7 @@ CUtlCStringConversion::CUtlCStringConversion(char nEscapeChar, const char* pDeli
|
|||||||
// Finds a conversion for the passed-in string, returns length
|
// Finds a conversion for the passed-in string, returns length
|
||||||
char CUtlCStringConversion::FindConversion(const char* pString, ssize_t* pLength)
|
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;
|
*pLength = (c != '\0') ? 1 : 0;
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user