Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Use key from map when searching for custom func

Browse Source
This commit is contained in:
FutureRave 2022-02-25 12:37:01 +00:00
parent a79c311ad9
commit 4156bacf2a
No known key found for this signature in database
GPG Key ID: E883E2BC9657D955
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Components/Modules/Script.cpp
View File

@ -295,7 +295,7 @@ namespace Components
{ {
for (const auto& [key, value] : Script::CustomScrFunctions) for (const auto& [key, value] : Script::CustomScrFunctions)
{ {
Game::Scr_RegisterFunction(reinterpret_cast<int>(value.actionFunc), value.actionString); Game::Scr_RegisterFunction(reinterpret_cast<int>(value.actionFunc), key.data());
} }
return Utils::Hook::Call<Game::xfunction_t(const char**, int*)>(0x44E700)(pName, type); // Scr_GetFunction return Utils::Hook::Call<Game::xfunction_t(const char**, int*)>(0x44E700)(pName, type); // Scr_GetFunction
@ -305,7 +305,7 @@ namespace Components
{ {
for (const auto& [key, value] : Script::CustomScrMethods) for (const auto& [key, value] : Script::CustomScrMethods)
{ {
Game::Scr_RegisterFunction(reinterpret_cast<int>(value.actionFunc), value.actionString); Game::Scr_RegisterFunction(reinterpret_cast<int>(value.actionFunc), key.data());
} }
return Utils::Hook::Call<Game::xmethod_t(const char**, int*)>(0x4EC870)(pName, type); // Scr_GetMethod return Utils::Hook::Call<Game::xmethod_t(const char**, int*)>(0x4EC870)(pName, type); // Scr_GetMethod
@ -315,7 +315,7 @@ namespace Components
{ {
if (pName && *pName) if (pName && *pName)
{ {
const auto got = Script::CustomScrFunctions.find(*pName); const auto got = Script::CustomScrFunctions.find(Utils::String::ToLower(*pName));
// If no function was found let's call game's function // If no function was found let's call game's function
if (got != Script::CustomScrFunctions.end()) if (got != Script::CustomScrFunctions.end())
@ -332,7 +332,7 @@ namespace Components
{ {
if (pName && *pName) if (pName && *pName)
{ {
const auto got = Script::CustomScrMethods.find(*pName); const auto got = Script::CustomScrMethods.find(Utils::String::ToLower(*pName));
// If no method was found let's call game's function // If no method was found let's call game's function
if (got != Script::CustomScrMethods.end()) if (got != Script::CustomScrMethods.end())