ModdingRX/TmpMenu
1
0
Fork 0
mirror of https://github.com/Mr-X-GTA/YimMenu.git synced 2024-12-22 20:17:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed incorrect typing of crash_objects array to allow the compiler to determine which is best. (#2859)

Browse Source
This commit is contained in:
gir489 2024-03-22 04:24:39 -04:00 committed by GitHub
parent a6ded86e3f
commit 2961abfa97
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/protection.cpp
View File

@ -4,7 +4,7 @@
namespace big::protection
{
constexpr unsigned int crash_objects[126] = {"prop_facgate_05_r_dam_l1"_J, "v_61_lng_mesh_unita_swap"_J, "prop_crt_mon_02"_J, "xs_prop_arena_pit_fire_01a_wl"_J, "prop_billboard_07"_J, "prop_recyclebin_02_d"_J, "prop_billboard_14"_J, "v_res_fa_book02"_J, "sf_int1_dropdownlight041"_J, "w_sg_pumpshotgunmk2_camo6"_J, "ch_prop_cash_low_trolly_01b"_J, "prop_ld_headset_01"_J, "sf_int1_office_wpaper_6"_J, "v_74_it3_ceiling_smoke_01_skin"_J, "prop_sh_tt_fridgedoor"_J, "ch_prop_arcade_race_02a"_J, "v_61_kit_over_dec_cruma"_J, "gr_prop_gr_rsply_crate01a"_J, "prop_snow_streetlight_01_frag_"_J, "v_34_sm_proc"_J, "tr_int1_lightcap_proxy001"_J, "v_ilev_tort_door"_J, "ch_prop_arcade_street_01b"_J, "prop_ic_repair_p"_J, "sf_int2_elevator_details_02"_J, "prop_cs4_05_tdoor"_J, "vfx_it1_02"_J, "cloudhat_wispy_b"_J, "hei_p_pre_heist_trash"_J, "v_ilev_trev_patiodoor"_J, "prop_bin_10a"_J, "sm_prop_offchair_smug_01"_J, "stt_prop_stunt_tube_fn_02"_J, "m23_2_prop_m32_hat_captain_01a"_J, "vw_prop_vw_arcade_04d_screen"_J, "prop_food_juice02"_J, "m23_2_prop_m32_mazebankcard_01a"_J, "v_28_alrm_case011"_J, "apa_mp_h_acc_pot_pouri_01"_J, "xm3_prop_xm3_crate_ammo_01a"_J, "prop_blackjack_01"_J, "prop_cs_mini_tv"_J, "v_res_fa_basket"_J, "prop_plant_int_02b"_J, "prop_umpire_01"_J, "gr_prop_gr_fnclink_03g"_J, "prop_rub_tyre_dam3"_J, "ba_prop_battle_lights_support"_J, "prop_fnclink_09a"_J, "ba_prop_battle_dj_mixer_01e"_J, "ar_prop_ar_neon_gate8x_04a"_J, "xs_propintarena_structure_f_03b"_J, "des_plog_door_end"_J, "v_ret_fh_chair01"_J, "gr_prop_gr_offchair_01a"_J, "hei_p_pre_heist_coke"_J, "cloudhat_puff_b"_J, "v_ind_cfbucket"_J, "p_hw1_22_doors_s"_J, "arbitergt"_J, "slod_human"_J, "prop_dummy_01"_J, "prop_dummy_car"_J, "prop_dummy_light"_J, "prop_dummy_plane"_J, "prop_distantcar_night"_J, "prop_distantcar_day"_J, "hei_bh1_08_details4_em_night"_J, "dt1_18_sq_night_slod"_J, "ss1_12_night_slod"_J, "hash_b334b5e2_qyquzxq_collision"_J, "h4_prop_bush_bgnvla_med_01"_J, "h4_prop_bush_bgnvla_lrg_01"_J, "h4_prop_bush_buddleia_low_01"_J, "h4_prop_bush_ear_aa"_J, "h4_prop_bush_ear_ab"_J, "h4_prop_bush_fern_low_01"_J, "h4_prop_bush_fern_tall_cc"_J, "h4_prop_bush_mang_ad"_J, "h4_prop_bush_mang_low_aa"_J, "h4_prop_bush_mang_low_ab"_J, "h4_prop_bush_seagrape_low_01"_J, "prop_h4_ground_cover"_J, "h4_prop_weed_groundcover_01"_J, "h4_prop_grass_med_01"_J, "h4_prop_grass_tropical_lush_01"_J, "h4_prop_grass_wiregrass_01"_J, "h4_prop_weed_01_plant"_J, "h4_prop_weed_01_row"_J, "urbanweeds02_l1"_J, "proc_forest_grass01"_J, "prop_small_bushyba"_J, "v_res_d_dildo_a"_J, "v_res_d_dildo_b"_J, "v_res_d_dildo_c"_J, "v_res_d_dildo_d"_J, "v_res_d_dildo_e"_J, "v_res_d_dildo_f"_J, "v_res_skateboard"_J, "prop_battery_01"_J, "prop_barbell_01"_J, "prop_barbell_02"_J, "prop_bandsaw_01"_J, "prop_bbq_3"_J, "v_med_curtainsnewcloth2"_J, "bh1_07_flagpoles"_J, "hash_058a7eb5_deihiws_collision"_J, "proc_dry_plants_01"_J, "proc_leafyplant_01"_J, "proc_grassplantmix_02"_J, "proc_dryplantsgrass_01"_J, "proc_dryplantsgrass_02"_J, "proc_dryplantsgrass_02"_J, "proc_grasses01"_J, "prop_dryweed_002_a"_J, "prop_fernba"_J, "prop_weed_001_aa"_J, "urbangrnfrnds_01"_J, "urbanweeds01"_J, "prop_dandy_b"_J, "v_proc2_temp"_J, "prop_fernbb"_J, "proc_drygrassfronds01"_J, "prop_log_ae"_J, "prop_grass_da"_J, "prop_fragtest_cnst_04"_J};
constexpr auto crash_objects = {"prop_facgate_05_r_dam_l1"_J, "v_61_lng_mesh_unita_swap"_J, "prop_crt_mon_02"_J, "xs_prop_arena_pit_fire_01a_wl"_J, "prop_billboard_07"_J, "prop_recyclebin_02_d"_J, "prop_billboard_14"_J, "v_res_fa_book02"_J, "sf_int1_dropdownlight041"_J, "w_sg_pumpshotgunmk2_camo6"_J, "ch_prop_cash_low_trolly_01b"_J, "prop_ld_headset_01"_J, "sf_int1_office_wpaper_6"_J, "v_74_it3_ceiling_smoke_01_skin"_J, "prop_sh_tt_fridgedoor"_J, "ch_prop_arcade_race_02a"_J, "v_61_kit_over_dec_cruma"_J, "gr_prop_gr_rsply_crate01a"_J, "prop_snow_streetlight_01_frag_"_J, "v_34_sm_proc"_J, "tr_int1_lightcap_proxy001"_J, "v_ilev_tort_door"_J, "ch_prop_arcade_street_01b"_J, "prop_ic_repair_p"_J, "sf_int2_elevator_details_02"_J, "prop_cs4_05_tdoor"_J, "vfx_it1_02"_J, "cloudhat_wispy_b"_J, "hei_p_pre_heist_trash"_J, "v_ilev_trev_patiodoor"_J, "prop_bin_10a"_J, "sm_prop_offchair_smug_01"_J, "stt_prop_stunt_tube_fn_02"_J, "m23_2_prop_m32_hat_captain_01a"_J, "vw_prop_vw_arcade_04d_screen"_J, "prop_food_juice02"_J, "m23_2_prop_m32_mazebankcard_01a"_J, "v_28_alrm_case011"_J, "apa_mp_h_acc_pot_pouri_01"_J, "xm3_prop_xm3_crate_ammo_01a"_J, "prop_blackjack_01"_J, "prop_cs_mini_tv"_J, "v_res_fa_basket"_J, "prop_plant_int_02b"_J, "prop_umpire_01"_J, "gr_prop_gr_fnclink_03g"_J, "prop_rub_tyre_dam3"_J, "ba_prop_battle_lights_support"_J, "prop_fnclink_09a"_J, "ba_prop_battle_dj_mixer_01e"_J, "ar_prop_ar_neon_gate8x_04a"_J, "xs_propintarena_structure_f_03b"_J, "des_plog_door_end"_J, "v_ret_fh_chair01"_J, "gr_prop_gr_offchair_01a"_J, "hei_p_pre_heist_coke"_J, "cloudhat_puff_b"_J, "v_ind_cfbucket"_J, "p_hw1_22_doors_s"_J, "arbitergt"_J, "slod_human"_J, "prop_dummy_01"_J, "prop_dummy_car"_J, "prop_dummy_light"_J, "prop_dummy_plane"_J, "prop_distantcar_night"_J, "prop_distantcar_day"_J, "hei_bh1_08_details4_em_night"_J, "dt1_18_sq_night_slod"_J, "ss1_12_night_slod"_J, "hash_b334b5e2_qyquzxq_collision"_J, "h4_prop_bush_bgnvla_med_01"_J, "h4_prop_bush_bgnvla_lrg_01"_J, "h4_prop_bush_buddleia_low_01"_J, "h4_prop_bush_ear_aa"_J, "h4_prop_bush_ear_ab"_J, "h4_prop_bush_fern_low_01"_J, "h4_prop_bush_fern_tall_cc"_J, "h4_prop_bush_mang_ad"_J, "h4_prop_bush_mang_low_aa"_J, "h4_prop_bush_mang_low_ab"_J, "h4_prop_bush_seagrape_low_01"_J, "prop_h4_ground_cover"_J, "h4_prop_weed_groundcover_01"_J, "h4_prop_grass_med_01"_J, "h4_prop_grass_tropical_lush_01"_J, "h4_prop_grass_wiregrass_01"_J, "h4_prop_weed_01_plant"_J, "h4_prop_weed_01_row"_J, "urbanweeds02_l1"_J, "proc_forest_grass01"_J, "prop_small_bushyba"_J, "v_res_d_dildo_a"_J, "v_res_d_dildo_b"_J, "v_res_d_dildo_c"_J, "v_res_d_dildo_d"_J, "v_res_d_dildo_e"_J, "v_res_d_dildo_f"_J, "v_res_skateboard"_J, "prop_battery_01"_J, "prop_barbell_01"_J, "prop_barbell_02"_J, "prop_bandsaw_01"_J, "prop_bbq_3"_J, "v_med_curtainsnewcloth2"_J, "bh1_07_flagpoles"_J, "hash_058a7eb5_deihiws_collision"_J, "proc_dry_plants_01"_J, "proc_leafyplant_01"_J, "proc_grassplantmix_02"_J, "proc_dryplantsgrass_01"_J, "proc_dryplantsgrass_02"_J, "proc_dryplantsgrass_02"_J, "proc_grasses01"_J, "prop_dryweed_002_a"_J, "prop_fernba"_J, "prop_weed_001_aa"_J, "urbangrnfrnds_01"_J, "urbanweeds01"_J, "prop_dandy_b"_J, "v_proc2_temp"_J, "prop_fernbb"_J, "proc_drygrassfronds01"_J, "prop_log_ae"_J, "prop_grass_da"_J, "prop_fragtest_cnst_04"_J};
bool is_crash_object(rage::joaat_t model)
{
if (!model_info::get_model(model))