From 077cbe9a016d73e053d103fe772aa82c80f373ba Mon Sep 17 00:00:00 2001 From: rtldg <55846624+rtldg@users.noreply.github.com> Date: Tue, 17 Aug 2021 23:50:51 +0000 Subject: [PATCH] use lowercase strings when sending to GuessBestMapName --- addons/sourcemod/scripting/include/shavit.inc | 12 +++++------- addons/sourcemod/scripting/shavit-rankings.sp | 4 +++- addons/sourcemod/scripting/shavit-wr.sp | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/addons/sourcemod/scripting/include/shavit.inc b/addons/sourcemod/scripting/include/shavit.inc index f249aa26..9ad6f04f 100644 --- a/addons/sourcemod/scripting/include/shavit.inc +++ b/addons/sourcemod/scripting/include/shavit.inc @@ -485,25 +485,23 @@ stock void FormatSeconds(float time, char[] newtime, int newtimesize, bool preci } } -stock bool GuessBestMapName(ArrayList maps, const char[] input, char[] output, int size) +stock bool GuessBestMapName(ArrayList maps, const char input[PLATFORM_MAX_PATH], char output[PLATFORM_MAX_PATH]) { if(maps.FindString(input) != -1) { - strcopy(output, size, input); - + output = input; return true; } - char sCache[128]; + char sCache[PLATFORM_MAX_PATH]; for(int i = 0; i < maps.Length; i++) { - maps.GetString(i, sCache, 128); + maps.GetString(i, sCache, PLATFORM_MAX_PATH); if(StrContains(sCache, input) != -1) { - strcopy(output, size, sCache); - + output = sCache; return true; } } diff --git a/addons/sourcemod/scripting/shavit-rankings.sp b/addons/sourcemod/scripting/shavit-rankings.sp index 04533ddb..8fc5fcc4 100644 --- a/addons/sourcemod/scripting/shavit-rankings.sp +++ b/addons/sourcemod/scripting/shavit-rankings.sp @@ -441,6 +441,7 @@ public void SQL_FillTierCache_Callback(Database db, DBResultSet results, const c { char sMap[PLATFORM_MAX_PATH]; results.FetchString(0, sMap, sizeof(sMap)); + LowercaseString(sMap); int tier = results.FetchInt(1); @@ -564,8 +565,9 @@ public Action Command_Tier(int client, int args) else { GetCmdArgString(sMap, sizeof(sMap)); + LowercaseString(sMap); - if(!GuessBestMapName(gA_ValidMaps, sMap, sMap, sizeof(sMap)) || !gA_MapTiers.GetValue(sMap, tier)) + if(!GuessBestMapName(gA_ValidMaps, sMap, sMap) || !gA_MapTiers.GetValue(sMap, tier)) { Shavit_PrintToChat(client, "%t", "Map was not found", sMap); return Plugin_Handled; diff --git a/addons/sourcemod/scripting/shavit-wr.sp b/addons/sourcemod/scripting/shavit-wr.sp index c3ce04c1..b059f5be 100644 --- a/addons/sourcemod/scripting/shavit-wr.sp +++ b/addons/sourcemod/scripting/shavit-wr.sp @@ -1503,8 +1503,9 @@ public Action Command_WorldRecord(int client, int args) else { GetCmdArg(1, gA_WRCache[client].sClientMap, sizeof(wrcache_t::sClientMap)); + LowercaseString(gA_WRCache[client].sClientMap); - if (!GuessBestMapName(gA_ValidMaps, gA_WRCache[client].sClientMap, gA_WRCache[client].sClientMap, sizeof(wrcache_t::sClientMap))) + if (!GuessBestMapName(gA_ValidMaps, gA_WRCache[client].sClientMap, gA_WRCache[client].sClientMap)) { Shavit_PrintToChat(client, "%t", "Map was not found", gA_WRCache[client].sClientMap); return Plugin_Handled;