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

Apply vehicle god mode to personal vehicle even when not driving it (#1771)

Browse Source 
Closes #1768
This commit is contained in:
gir489 2023-07-19 11:21:34 -04:00 committed by GitHub
parent e96af54d29
commit 44f79a4284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/backend/looped/vehicle/vehicle_god.cpp
View File

@ -1,6 +1,7 @@
#include "backend/looped/looped.hpp" #include "backend/looped/looped.hpp"
#include "backend/looped_command.hpp" #include "backend/looped_command.hpp"
#include "natives.hpp" #include "natives.hpp"
#include "util/mobile.hpp"
namespace big namespace big
{ {
@ -12,34 +13,37 @@ namespace big
float last_water_collistion_strength = 0; float last_water_collistion_strength = 0;
bool last_driving = false; bool last_driving = false;
virtual void on_tick() override void apply_godmode_to_vehicle(CVehicle* vehicle, bool personal_vehicle = false)
{ {
if (g_local_player == nullptr || g_local_player->m_vehicle == nullptr) if (vehicle == nullptr)
{ {
return; return;
} }
if (!PED::GET_PED_CONFIG_FLAG(self::ped, 62, false)) if (!personal_vehicle)
{ {
if (last_driving) if (!PED::GET_PED_CONFIG_FLAG(self::ped, 62, false))
{ {
g_local_player->m_vehicle->m_deform_god = 0x9C; if (last_driving)
g_local_player->m_vehicle->m_damage_bits = 0; {
vehicle->m_deform_god = 0x9C;
vehicle->m_damage_bits = 0;
}
last_driving = false;
return;
} }
last_driving = false; last_driving = true;
return;
} }
last_driving = true;
if (g.vehicle.god_mode || g.vehicle.proof_collision) if (g.vehicle.god_mode || g.vehicle.proof_collision)
{ {
g_local_player->m_vehicle->m_deform_god = 0x8C; vehicle->m_deform_god = 0x8C;
} }
else else
{ {
g_local_player->m_vehicle->m_deform_god = 0x9C; vehicle->m_deform_god = 0x9C;
} }
uint32_t bits = g.vehicle.proof_mask; uint32_t bits = g.vehicle.proof_mask;
@ -48,9 +52,26 @@ namespace big
if (changed_or_enabled_bits) if (changed_or_enabled_bits)
{ {
uint32_t unchanged_bits = g_local_player->m_vehicle->m_damage_bits & ~changed_or_enabled_bits; uint32_t unchanged_bits = vehicle->m_damage_bits & ~changed_or_enabled_bits;
g_local_player->m_vehicle->m_damage_bits = unchanged_bits | bits; vehicle->m_damage_bits = unchanged_bits | bits;
last_bits = bits; if (personal_vehicle == false)
{
last_bits = bits;
}
}
}
virtual void on_tick() override
{
if (g_local_player)
{
Vehicle personal_vehicle = mobile::mechanic::get_personal_vehicle();
if (ENTITY::DOES_ENTITY_EXIST(personal_vehicle))
{
const auto personal_vehicle_ptr = reinterpret_cast<CVehicle*>(g_pointers->m_gta.m_handle_to_ptr(personal_vehicle));
apply_godmode_to_vehicle(personal_vehicle_ptr, true);
}
apply_godmode_to_vehicle(g_local_player->m_vehicle);
} }
} }