From 84070b1a4bf3a621d97c81db30c94a9cc38cec0e Mon Sep 17 00:00:00 2001 From: "Quentin E. / iDeath" Date: Wed, 26 Jul 2023 18:02:55 +0200 Subject: [PATCH] tentative debugging --- src/services/gta_data/gta_data_service.cpp | 7 +++++++ src/services/gta_data/yim_fipackfile.cpp | 13 +------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/services/gta_data/gta_data_service.cpp b/src/services/gta_data/gta_data_service.cpp index ffb2ff36..6191530a 100644 --- a/src/services/gta_data/gta_data_service.cpp +++ b/src/services/gta_data/gta_data_service.cpp @@ -154,6 +154,13 @@ namespace big const auto file_version = memory::module("GTA5.exe").size(); + const auto ped_count = m_peds_cache.data_size() / sizeof(ped_item); + const auto vehicle_count = m_vehicles_cache.data_size() / sizeof(vehicle_item); + if (ped_count == 0 || vehicle_count == 0) + { + return false; + } + return m_peds_cache.up_to_date(file_version) && m_vehicles_cache.up_to_date(file_version) && m_weapons_cache.up_to_date(file_version); } diff --git a/src/services/gta_data/yim_fipackfile.cpp b/src/services/gta_data/yim_fipackfile.cpp index b52d8561..1381d5c1 100644 --- a/src/services/gta_data/yim_fipackfile.cpp +++ b/src/services/gta_data/yim_fipackfile.cpp @@ -20,18 +20,7 @@ namespace big static bool safe_open_pack_file(rage::fiPackfile& packfile, const std::u8string& path) { - bool success = false; - - __try - { - success = packfile.OpenPackfile(reinterpret_cast(path.c_str()), true, 0, 0); - } - __except (EXCEPTION_EXECUTE_HANDLER) - { - return false; - } - - return success; + return packfile.OpenPackfile(reinterpret_cast(path.c_str()), true, 0, 0); } void yim_fipackfile::traverse_rpf_file(const std::u8string& path, int depth)