From 5889d7e75321baefac406b2e29065dd4060987ea Mon Sep 17 00:00:00 2001 From: Cekis Date: Thu, 4 Nov 2021 17:04:49 -0400 Subject: [PATCH] Fixed issue with profanity filter --- .../src/shared/core/TextManager.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/engine/shared/library/sharedGame/src/shared/core/TextManager.cpp b/engine/shared/library/sharedGame/src/shared/core/TextManager.cpp index 741f494e..599ee57c 100755 --- a/engine/shared/library/sharedGame/src/shared/core/TextManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/TextManager.cpp @@ -120,7 +120,7 @@ void TextManagerNamespace::getAppropriateWord(Unicode::String &text) // Sub-string search time for words that are listed for sub-string searches Unicode::String lowerText(Unicode::toLower(text)); - unsigned int findStartPosition = 0; + size_t findStartPosition = 0; for (;;) { @@ -137,7 +137,7 @@ void TextManagerNamespace::getAppropriateWord(Unicode::String &text) continue; } - unsigned int index = lowerText.find(cussWord, findStartPosition); + size_t index = lowerText.find(cussWord, findStartPosition); if (index != Unicode::String::npos) { @@ -297,8 +297,8 @@ Unicode::String TextManager::filterText(Unicode::String const &text) { Unicode::String result(text); Unicode::String::const_iterator iterText = text.begin(); - int startIndex = Unicode::String::npos; - int currentIndex = 0; + size_t startIndex = Unicode::String::npos; + size_t currentIndex = 0; { // Walk through the text finding sections of alpha characters. @@ -309,12 +309,12 @@ Unicode::String TextManager::filterText(Unicode::String const &text) { Unicode::unicode_char_t const character = (*iterText); - if ( (static_cast(startIndex) == Unicode::String::npos) + if ( (startIndex == Unicode::String::npos) && isAlpha(character)) { startIndex = currentIndex; } - else if ( (static_cast(startIndex) != Unicode::String::npos) + else if ( (startIndex != Unicode::String::npos) && !isAlpha(character)) { checkText(result, startIndex, currentIndex); @@ -327,7 +327,7 @@ Unicode::String TextManager::filterText(Unicode::String const &text) // Possibly check the last word - if (static_cast(startIndex) != Unicode::String::npos) + if (startIndex != Unicode::String::npos) { checkText(result, startIndex, currentIndex); } @@ -346,12 +346,12 @@ Unicode::String TextManager::filterText(Unicode::String const &text) { Unicode::unicode_char_t const character = (*iterText); - if ( (static_cast(startIndex) == Unicode::String::npos) + if ( (startIndex == Unicode::String::npos) && character != static_cast(' ')) { startIndex = currentIndex; } - else if ( (static_cast(startIndex) != Unicode::String::npos) + else if ( (startIndex != Unicode::String::npos) && character == static_cast(' ')) { checkText(result, startIndex, currentIndex); @@ -364,7 +364,7 @@ Unicode::String TextManager::filterText(Unicode::String const &text) // Possibly check the last word - if (static_cast(startIndex) != Unicode::String::npos) + if (startIndex != Unicode::String::npos) { checkText(result, startIndex, currentIndex); }