From a43d3d882499f5f79317c6d69e71445dc6d95884 Mon Sep 17 00:00:00 2001 From: Andreas Maerten <24669514+Yimura@users.noreply.github.com> Date: Fri, 30 Jun 2023 20:38:30 +0200 Subject: [PATCH] fix: Context Menu crash & Vehicle God mode (#1571) * fix(ContextMenu): nullptr dereference while drawing box * fix(ESP): Vehicle God mode check if ped is actually driving --- src/services/context_menu/context_menu_service.cpp | 6 +++++- src/views/esp/view_esp.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/services/context_menu/context_menu_service.cpp b/src/services/context_menu/context_menu_service.cpp index 6afad45e..ed478860 100644 --- a/src/services/context_menu/context_menu_service.cpp +++ b/src/services/context_menu/context_menu_service.cpp @@ -30,7 +30,11 @@ namespace big MISC::GET_MODEL_DIMENSIONS(hash, &min, &max); const auto dimensions = (max - min) * 0.5f; - const auto& position = *m_pointer->m_navigation->get_position(); + // sanity check + if (!m_pointer || !m_pointer->m_navigation) + return; + // make copy just in case + const auto position = *m_pointer->m_navigation->get_position(); rage::fvector3 front_upper_right, back_lower_left; front_upper_right.x = position.x + dimensions.y * forward.x + dimensions.x * right.x + dimensions.z * up.x; diff --git a/src/views/esp/view_esp.cpp b/src/views/esp/view_esp.cpp index 97aa452f..c75b3234 100644 --- a/src/views/esp/view_esp.cpp +++ b/src/views/esp/view_esp.cpp @@ -102,10 +102,12 @@ namespace big } } - if (auto player_vehicle = plyr->get_current_vehicle()) + if (auto player_vehicle = plyr->get_current_vehicle(); + player_vehicle && + (plyr->get_ped()->m_ped_task_flag & (uint32_t)ePedTask::TASK_DRIVING) && + (player_vehicle->m_damage_bits & (uint32_t)eEntityProofs::GOD)) { - if (player_vehicle->m_damage_bits & (uint32_t)eEntityProofs::GOD) - mode_str = +"VEH_GOD"; + mode_str =+ "Vehicle God"; } if (!mode_str.empty())