From 5c3b50cab7c43c4001ddd97bbe906eb3048159b5 Mon Sep 17 00:00:00 2001 From: gir489 <100792176+gir489returns@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:01:57 -0500 Subject: [PATCH] New am_launcher scripts to block. (#2456) * Added new scripts from Incorruptible to the am_launcher blocker. Refactored START_NEW_SCRIPT_WITH_ARGS hook to use O(1) operation instead of 50 if compares, lmao. --- src/native_hooks/am_launcher.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/native_hooks/am_launcher.hpp b/src/native_hooks/am_launcher.hpp index 3430b4b2..73e9e777 100644 --- a/src/native_hooks/am_launcher.hpp +++ b/src/native_hooks/am_launcher.hpp @@ -11,9 +11,9 @@ namespace big int argc = src->get_arg(2); int stackSize = src->get_arg(3); - Hash name_hash = rage::joaat(name); + const std::unordered_set bad_script_hashes = {RAGE_JOAAT("ggsm_arcade"), RAGE_JOAAT("camhedz_arcade"), RAGE_JOAAT("wizard_arcade"), RAGE_JOAAT("puzzle"), RAGE_JOAAT("fm_intro"), RAGE_JOAAT("pilot_school_mp"), RAGE_JOAAT("golf_mp"), RAGE_JOAAT("tennis_network_mp"), RAGE_JOAAT("fm_race_controler"), RAGE_JOAAT("fm_horde_controler"), RAGE_JOAAT("fm_mission_controller"), RAGE_JOAAT("fm_mission_controller_2020"), RAGE_JOAAT("fm_impromptu_dm_controler"), RAGE_JOAAT("fm_deathmatch_controler"), RAGE_JOAAT("fm_bj_race_controler"), RAGE_JOAAT("fm_survival_controller"), RAGE_JOAAT("sctv"), RAGE_JOAAT("am_pi_menu"), RAGE_JOAAT("scroll_arcade_cabinet"), RAGE_JOAAT("grid_arcade_cabinet"), RAGE_JOAAT("degenatron_games"), RAGE_JOAAT("gunslinger_arcade"), RAGE_JOAAT("road_arcade"), RAGE_JOAAT("AM_MP_DRONE")}; - if (name_hash == RAGE_JOAAT("ggsm_arcade") || name_hash == RAGE_JOAAT("camhedz_arcade") || name_hash == RAGE_JOAAT("wizard_arcade") || name_hash == RAGE_JOAAT("puzzle") || name_hash == RAGE_JOAAT("fm_intro") || name_hash == RAGE_JOAAT("pilot_school_mp") || name_hash == RAGE_JOAAT("golf_mp") || name_hash == RAGE_JOAAT("tennis_network_mp") || name_hash == RAGE_JOAAT("fm_race_controler") || name_hash == RAGE_JOAAT("fm_horde_controler") || name_hash == RAGE_JOAAT("fm_mission_controller") || name_hash == RAGE_JOAAT("fm_mission_controller_2020") || name_hash == RAGE_JOAAT("fm_impromptu_dm_controler") || name_hash == RAGE_JOAAT("fm_deathmatch_controler") || name_hash == RAGE_JOAAT("fm_bj_race_controler") || name_hash == RAGE_JOAAT("fm_survival_controller") || name_hash == RAGE_JOAAT("tennis_network_mp") || name_hash == RAGE_JOAAT("sctv") || name_hash == RAGE_JOAAT("am_pi_menu")) + if (bad_script_hashes.contains(rage::joaat(name))) { src->set_return_value(0); return;