ModdingRX/TmpMenu
1
0
Fork 0
mirror of https://github.com/Mr-X-GTA/YimMenu.git synced 2025-06-17 23:07:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(rapid-fire): fix rapid fire for some reason not shooting from the weapon position but instead from the cam. Fix rapid fire not being available in vehicles. (#1700)

Browse Source
This commit is contained in:
Quentin 2023-07-13 16:50:30 +02:00 committed by GitHub
parent 0a5cca8c12
commit 33433ff5b3
1 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/backend/looped/weapons/rapid_fire.cpp
View File

@ -12,16 +12,52 @@ namespace big
virtual void on_tick() override
{
if (!HUD::IS_PAUSE_MENU_ACTIVE() && !g_gui->is_open() && !PED::IS_PED_DEAD_OR_DYING(self::ped, true) && !PED::IS_PED_IN_ANY_VEHICLE(self::ped, TRUE))
if (!HUD::IS_PAUSE_MENU_ACTIVE() && !g_gui->is_open() && !PED::IS_PED_DEAD_OR_DYING(self::ped, true))
{
if (PAD::IS_DISABLED_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_ATTACK))
{
Vector3 direction = math::rotation_to_direction(CAM::GET_GAMEPLAY_CAM_ROT(0));
Vector3 start = CAM::GET_GAMEPLAY_CAM_COORD() + direction;
Vector3 end = start + direction * 200.0;
const auto weapon_entity = WEAPON::GET_CURRENT_PED_WEAPON_ENTITY_INDEX(self::ped, 0);
if (!weapon_entity)
return;
LOG(INFO) << weapon_entity;
Vector3 dim_min;
Vector3 dim_max;
MISC::GET_MODEL_DIMENSIONS(ENTITY::GET_ENTITY_MODEL(weapon_entity), &dim_min, &dim_max);
const auto dimensions = (dim_max - dim_min) * 0.5f;
const auto weapon_position =
ENTITY::GET_OFFSET_FROM_ENTITY_IN_WORLD_COORDS(weapon_entity, dimensions.x, 0, dimensions.z * 0.3f);
auto camera_direction = math::rotation_to_direction(CAM::GET_GAMEPLAY_CAM_ROT(0));
auto camera_position = CAM::GET_GAMEPLAY_CAM_COORD() + camera_direction;
Vector3 end = camera_position + camera_direction * 2000.0;
const auto raycast_handle =
SHAPETEST::START_EXPENSIVE_SYNCHRONOUS_SHAPE_TEST_LOS_PROBE(
camera_position.x,
camera_position.y,
camera_position.z,
end.x,
end.y,
end.z,
-1, 0, 7);
int did_raycast_hit = 0;
Vector3 raycast_hit_position{};
Vector3 raycast_surface_normal_hit_position{};
Entity raycast_hit_entity{};
SHAPETEST::GET_SHAPE_TEST_RESULT(raycast_handle, &did_raycast_hit, &raycast_hit_position, &raycast_surface_normal_hit_position, &raycast_hit_entity);
if (did_raycast_hit)
{
end = raycast_hit_position;
}
Hash weapon_hash;
WEAPON::GET_CURRENT_PED_WEAPON(self::ped, &weapon_hash, false);
MISC::SHOOT_SINGLE_BULLET_BETWEEN_COORDS(start.x, start.y, start.z, end.x, end.y, end.z, WEAPON::GET_WEAPON_DAMAGE(weapon_hash, 0), true, weapon_hash, self::ped, true, false, -1.0);
MISC::SHOOT_SINGLE_BULLET_BETWEEN_COORDS(weapon_position.x, weapon_position.y, weapon_position.z, end.x, end.y, end.z, WEAPON::GET_WEAPON_DAMAGE(weapon_hash, 0), true, weapon_hash, self::ped, true, false, -1.0);
}
}
}