From 9d653a8fa1c0aca0652131b4391660c51f831834 Mon Sep 17 00:00:00 2001 From: LightCat Date: Thu, 18 Oct 2018 11:16:47 +0200 Subject: [PATCH] Fix HookedFunctions --- src/hooks/HookTools.cpp | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/hooks/HookTools.cpp b/src/hooks/HookTools.cpp index 98780f4b..c8b2847d 100644 --- a/src/hooks/HookTools.cpp +++ b/src/hooks/HookTools.cpp @@ -9,16 +9,11 @@ std::vector &HookTools::GetHookedFunctions() // ----------------------------------------------------------- -static std::array bounds{}; - void RunHookedFunctions(HookedFunctions_types type) { auto &HookedFunctions = HookTools::GetHookedFunctions(); - for (int i = bounds.at(type); i < HookedFunctions.size(); i++) - { - if (!HookedFunctions.at(i)->run(type)) - break; - } + for (auto &i : HookedFunctions) + i->run(type); } void HookTools::CM() @@ -38,23 +33,10 @@ void HookTools::PAINT() static InitRoutine init([]() { auto &HookedFunctions = HookTools::GetHookedFunctions(); + logging::Info("Hooked Functions amount: %i", HookedFunctions.size()); std::sort(HookedFunctions.begin(), HookedFunctions.end(), [](HookedFunction *a, HookedFunction *b) { return *a > *b; }); logging::Info("Sorted Hooked Functions: %i", HookedFunctions.size()); - for (int i = 0; i < bounds.size(); i++) - { - for (int j = 0; j < HookedFunctions.size(); j++) - { - if (HookedFunctions.at(j)->m_type == i) - { - bounds.at(i) = j; - break; - } - } - } - logging::Info( - "Initialized HookedFunction bounds: CM: %i, Draw: %i, Paint: %i", - bounds.at(0), bounds.at(1), bounds.at(2)); }); static CatCommand print("debug_print_hookedfunctions",