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

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

@ -1,21 +1,22 @@
#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
class keep_vehicle_clean : looped_command {
{ class keep_vehicle_clean : looped_command
using looped_command::looped_command; {
using looped_command::looped_command;
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);
} }
}; }
};
keep_vehicle_clean
g_keep_vehicle_clean("keepvehicleclean", "KEEP_VEHICLE_CLEAN_CMD", "KEEP_VEHICLE_CLEAN_CMD_DESC", g.vehicle.keep_vehicle_clean); keep_vehicle_clean
g_keep_vehicle_clean("keepvehicleclean", "KEEP_VEHICLE_CLEAN_CMD", "KEEP_VEHICLE_CLEAN_CMD_DESC", g.vehicle.keep_vehicle_clean);
} }

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

@ -1,72 +1,79 @@
#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
class keep_vehicle_repaired : looped_command {
{ class keep_vehicle_repaired : looped_command
using looped_command::looped_command; {
using looped_command::looped_command;
virtual void on_tick() override
{ virtual void on_tick() override
const auto veh = self::veh; {
if (!ENTITY::IS_ENTITY_A_VEHICLE(veh) || !entity::take_control_of(veh, 0)) Vehicle veh = self::veh;
{
return; if (veh == 0 || VEHICLE::GET_PED_IN_VEHICLE_SEAT(self::veh, SEAT_DRIVER, FALSE) != self::ped)
} {
return;
if (VEHICLE::GET_DOES_VEHICLE_HAVE_DAMAGE_DECALS(veh)) }
{
if (!g.vehicle.keep_vehicle_clean) if (!entity::take_control_of(veh, 0))
{ {
VEHICLE::SET_VEHICLE_DIRT_LEVEL(veh, 0.f); return;
} }
// Rear window if (VEHICLE::GET_DOES_VEHICLE_HAVE_DAMAGE_DECALS(veh))
constexpr int rear_window_index = 7; {
if (!VEHICLE::IS_VEHICLE_WINDOW_INTACT(veh, rear_window_index)) if (!g.vehicle.keep_vehicle_clean)
{ {
VEHICLE::FIX_VEHICLE_WINDOW(veh, rear_window_index); VEHICLE::SET_VEHICLE_DIRT_LEVEL(veh, 0.f);
} }
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); // Rear window
constexpr int rear_window_index = 7;
if (!g.vehicle.god_mode) if (!VEHICLE::IS_VEHICLE_WINDOW_INTACT(veh, rear_window_index))
{ {
VEHICLE::SET_VEHICLE_DEFORMATION_FIXED(veh); VEHICLE::FIX_VEHICLE_WINDOW(veh, rear_window_index);
} }
vehicle::repair_engine_from_water(veh); 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);
const auto door_count = VEHICLE::GET_NUMBER_OF_VEHICLE_DOORS(veh); if (!g.vehicle.god_mode)
for (int i = 0; i < door_count; i++) {
{ VEHICLE::SET_VEHICLE_DEFORMATION_FIXED(veh);
if (VEHICLE::IS_VEHICLE_DOOR_DAMAGED(veh, i)) }
{
VEHICLE::SET_VEHICLE_FIXED(veh); vehicle::repair_engine_from_water(veh);
return;
} const auto door_count = VEHICLE::GET_NUMBER_OF_VEHICLE_DOORS(veh);
} for (int i = 0; i < door_count; i++)
{
for (int i = 0; i <= 14; i++) if (VEHICLE::IS_VEHICLE_DOOR_DAMAGED(veh, i))
{ {
if (VEHICLE::DOES_EXTRA_EXIST(veh, i) && VEHICLE::IS_VEHICLE_EXTRA_TURNED_ON(veh, i) && VEHICLE::IS_EXTRA_BROKEN_OFF(veh, i)) VEHICLE::SET_VEHICLE_FIXED(veh);
{ return;
VEHICLE::SET_VEHICLE_FIXED(veh); }
return; }
}
} for (int i = 0; i <= 14; i++)
{
if (VEHICLE::IS_VEHICLE_BUMPER_BOUNCING(veh, TRUE) || VEHICLE::IS_VEHICLE_BUMPER_BOUNCING(veh, FALSE) || VEHICLE::GET_VEHICLE_NUM_OF_BROKEN_LOOSEN_PARTS(veh) > 0) if (VEHICLE::DOES_EXTRA_EXIST(veh, i) && VEHICLE::IS_VEHICLE_EXTRA_TURNED_ON(veh, i) && VEHICLE::IS_EXTRA_BROKEN_OFF(veh, i))
{ {
VEHICLE::SET_VEHICLE_FIXED(veh); VEHICLE::SET_VEHICLE_FIXED(veh);
return; return;
} }
} }
}
}; if (VEHICLE::IS_VEHICLE_BUMPER_BOUNCING(veh, TRUE) || VEHICLE::IS_VEHICLE_BUMPER_BOUNCING(veh, FALSE) || VEHICLE::GET_VEHICLE_NUM_OF_BROKEN_LOOSEN_PARTS(veh) > 0)
{
keep_vehicle_repaired VEHICLE::SET_VEHICLE_FIXED(veh);
g_keep_vehicle_repaired("keepfixed", "KEEP_VEHICLE_FIXED", "KEEP_VEHICLE_FIXED_DESC", g.vehicle.keep_vehicle_repaired); return;
} }
}
}
};
keep_vehicle_repaired
g_keep_vehicle_repaired("keepfixed", "KEEP_VEHICLE_FIXED", "KEEP_VEHICLE_FIXED_DESC", g.vehicle.keep_vehicle_repaired);
}