Skip to content

Validate doors before attempting to open or close #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Firecul wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −5
Open

Validate doors before attempting to open or close #615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions vMenu/menus/VehicleOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,17 +222,40 @@ private void CreateMenu()
var veh = GetVehicle();
if (veh != null && veh.Exists() && !veh.IsDead && veh.Driver == Game.PlayerPed)
{
var open = GetVehicleDoorAngleRatio(veh.Handle, 0) < 0.1f;
if (open)
bool anyOpen = false;

// Check if any non-broken door is open
for (int i = 0; i < 8; i++)
{
for (var i = 0; i < 8; i++)
if (!IsVehicleDoorDamaged(veh.Handle, i) &&
GetVehicleDoorAngleRatio(veh.Handle, i) > 0.1f)
{
SetVehicleDoorOpen(veh.Handle, i, false, false);
anyOpen = true;
break;
}
}

if (anyOpen)
{
// Close all valid doors
for (int i = 0; i < 8; i++)
{
if (!IsVehicleDoorDamaged(veh.Handle, i))
{
SetVehicleDoorShut(veh.Handle, i, false);
}
}
}
else
{
SetVehicleDoorsShut(veh.Handle, false);
// Open all valid doors
for (int i = 0; i < 8; i++)
{
if (!IsVehicleDoorDamaged(veh.Handle, i))
{
SetVehicleDoorOpen(veh.Handle, i, false, false);
}
}
}
}
}), false));
Expand Down