ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

Prevent vehicle looped functions from running on vehicles we are not currently driving. (#3548)

Browse Source
This commit is contained in:
gir489 2024-08-10 19:12:29 -04:00 committed by GitHub
parent 94f956b50a
commit 555331ff1d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 100 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/looped/vehicle/keep_vehicle_clean.cpp
View File

@ -1,5 +1,6 @@
#include "backend/looped_command.hpp" #include "backend/looped_command.hpp"
#include "natives.hpp" #include "natives.hpp"
#include "gta/vehicle_values.hpp"
namespace big namespace big
{ {
@ -9,7 +10,7 @@ namespace big
virtual void on_tick() override virtual void on_tick() override
{ {
if (ENTITY::DOES_ENTITY_EXIST(self::veh)) if (self::veh != 0 && VEHICLE::GET_PED_IN_VEHICLE_SEAT(self::veh, SEAT_DRIVER, FALSE) == self::ped)
{ {
VEHICLE::SET_VEHICLE_DIRT_LEVEL(self::veh, 0.0f); VEHICLE::SET_VEHICLE_DIRT_LEVEL(self::veh, 0.0f);
} }

13
src/backend/looped/vehicle/keep_vehicle_repaired.cpp
View File

@ -1,6 +1,7 @@
#include "backend/looped_command.hpp" #include "backend/looped_command.hpp"
#include "natives.hpp" #include "natives.hpp"
#include "util/vehicle.hpp" #include "util/vehicle.hpp"
#include "gta/vehicle_values.hpp"
namespace big namespace big
{ {
@ -10,8 +11,14 @@ namespace big
virtual void on_tick() override virtual void on_tick() override
{ {
const auto veh = self::veh; Vehicle veh = self::veh;
if (!ENTITY::IS_ENTITY_A_VEHICLE(veh) || !entity::take_control_of(veh, 0))
if (veh == 0 || VEHICLE::GET_PED_IN_VEHICLE_SEAT(self::veh, SEAT_DRIVER, FALSE) != self::ped)
{
return;
}
if (!entity::take_control_of(veh, 0))
{ {
return; return;
} }
@ -30,7 +37,7 @@ namespace big
VEHICLE::FIX_VEHICLE_WINDOW(veh, rear_window_index); VEHICLE::FIX_VEHICLE_WINDOW(veh, rear_window_index);
} }
g_pointers->m_gta.m_decal_manager_remove(g_pointers->m_gta.m_decal_manager, g_pointers->m_gta.m_handle_to_ptr(veh), -1, 0, 0x00'01'E0'00); g_pointers->m_gta.m_decal_manager_remove(g_pointers->m_gta.m_decal_manager, g_pointers->m_gta.m_handle_to_ptr(veh), -1, 0, 0x0001E000);
if (!g.vehicle.god_mode) if (!g.vehicle.god_mode)
{ {