thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2024-11-08 00:37:15 +01:00
Code Releases Activity

Fix removal of non alpha-numeric characters from strings.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2022-07-23 17:42:01 +03:00
parent aa3952fd45
commit 44243aadd2
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/Misc/Player.cpp
View File

@ -114,7 +114,7 @@ int32_t GetSkinID(StackStrF & name)
// Clone the string into an editable version // Clone the string into an editable version
String str(name.mPtr, static_cast< size_t >(name.mLen)); String str(name.mPtr, static_cast< size_t >(name.mLen));
// Strip non-alphanumeric characters from the name // Strip non-alphanumeric characters from the name
str.erase(std::remove_if(str.begin(), str.end(), std::function<int(int)>(::isalnum)), str.end()); str.erase(std::remove_if(str.begin(), str.end(), [](char c) -> bool { return std::isalnum(c) == 0; }), str.end());
// Convert the string to lowercase // Convert the string to lowercase
std::transform(str.begin(), str.end(), str.begin(), ::tolower); std::transform(str.begin(), str.end(), str.begin(), ::tolower);
// See if we still have a valid name after the cleanup // See if we still have a valid name after the cleanup

2
module/Misc/Vehicle.cpp
View File

@ -123,7 +123,7 @@ int32_t GetAutomobileID(StackStrF & name)
// Clone the string into an editable version // Clone the string into an editable version
String str(name.mPtr, static_cast< size_t >(name.mLen)); String str(name.mPtr, static_cast< size_t >(name.mLen));
// Strip non-alphanumeric characters from the name // Strip non-alphanumeric characters from the name
str.erase(std::remove_if(str.begin(), str.end(), std::function<int(int)>(::isalnum)), str.end()); str.erase(std::remove_if(str.begin(), str.end(), [](char c) -> bool { return std::isalnum(c) == 0; }), str.end());
// Convert the string to lowercase // Convert the string to lowercase
std::transform(str.begin(), str.end(), str.begin(), ::tolower); std::transform(str.begin(), str.end(), str.begin(), ::tolower);
// See if we still have a valid name after the cleanup // See if we still have a valid name after the cleanup

6
module/Misc/Weapon.cpp
View File

@ -163,9 +163,10 @@ int32_t GetWeaponID(StackStrF & name)
// Clone the string into an editable version // Clone the string into an editable version
String str(name.mPtr, static_cast< size_t >(name.mLen)); String str(name.mPtr, static_cast< size_t >(name.mLen));
// Strip non-alphanumeric characters from the name // Strip non-alphanumeric characters from the name
str.erase(std::remove_if(str.begin(), str.end(), std::function<int(int)>(::isalnum)), str.end()); str.erase(std::remove_if(str.begin(), str.end(), [](char c) -> bool { return std::isalnum(c) == 0; }), str.end());
// Convert the string to lowercase // Convert the string to lowercase
std::transform(str.begin(), str.end(), str.begin(), ::tolower); std::transform(str.begin(), str.end(), str.begin(), ::tolower);
LogInf("%s", str.c_str());
// See if we still have a valid name after the cleanup // See if we still have a valid name after the cleanup
if(str.length() < 1) if(str.length() < 1)
{ {
@ -324,6 +325,7 @@ int32_t GetWeaponID(StackStrF & name)
// [S]PAS-12 Shotgun // [S]PAS-12 Shotgun
// [S]tubby Shotgun // [S]tubby Shotgun
// [S]uicide // [S]uicide
// Pump action [S]hotgun
case 's': case 's':
// [Sc]rewdriver // [Sc]rewdriver
if (b == 'c') return SQMOD_WEAPON_SCREWDRIVER; if (b == 'c') return SQMOD_WEAPON_SCREWDRIVER;
@ -337,7 +339,7 @@ int32_t GetWeaponID(StackStrF & name)
else if (b == 't') return SQMOD_WEAPON_STUBBY; else if (b == 't') return SQMOD_WEAPON_STUBBY;
// [Su]icide // [Su]icide
else if (b == 'u') return SQMOD_WEAPON_SUICIDE; else if (b == 'u') return SQMOD_WEAPON_SUICIDE;
// Pump action [Sh]otgun // Pump action [Sh]otgun
else if (b == 'h') return SQMOD_WEAPON_SHOTGUN; else if (b == 'h') return SQMOD_WEAPON_SHOTGUN;
// Default to unknwon // Default to unknwon
else return SQMOD_UNKNOWN; else return SQMOD_UNKNOWN;