Skip to content

Support for getVehicleWheelFrictionState on Bikes, Quads, and Monster Truck #4537

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
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Support for getVehicleWheelFrictionState on Bikes, Quads, and Monster Truck #4537

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
08cb5a3
Support getVehicleWheelFrictionState for bikes & monster truck & quad…
Xenius97 Nov 12, 2025
ca55da2
Add support for bicycles
Xenius97 Nov 12, 2025
ff10df1
Refactor vehicle wheel friction state retrieval for improved validation
Xenius97 Nov 13, 2025
bd7691a
Refactor GetVehicleWheelFrictionState to simplify vehicle type checks
Xenius97 Nov 13, 2025
c18d9f1
Allow trailers too
Xenius97 Nov 13, 2025
c963f1d
Merge branch 'master' into fix/vehicle_wheel_frictions
Xenius97 Nov 15, 2025
9936330
Merge branch 'master' into fix/vehicle_wheel_frictions
Xenius97 Nov 20, 2025
9784d99
Merge branch 'master' into fix/vehicle_wheel_frictions
Xenius97 Nov 29, 2025
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
23 changes: 21 additions & 2 deletions Client/game_sa/CVehicleSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,8 +1470,27 @@ bool CVehicleSA::IsWheelCollided(BYTE eWheelPosition)

int CVehicleSA::GetWheelFrictionState(BYTE eWheelPosition)
{
auto vehicle = static_cast<CAutomobileSAInterface*>(GetInterface());
return vehicle->m_wheelFrictionState[eWheelPosition];
switch (static_cast<VehicleClass>(GetVehicleInterface()->m_vehicleClass))
{
case VehicleClass::BIKE:
case VehicleClass::BMX:
{
auto* bikeInterface = static_cast<CBikeSAInterface*>(GetVehicleInterface());
if (!bikeInterface)
return false;

return bikeInterface->m_aiWheelState[eWheelPosition];
}
default:
{
auto* vehicleInterface = static_cast<CAutomobileSAInterface*>(GetVehicleInterface());
if (!vehicleInterface)
return false;

return vehicleInterface->m_wheelFrictionState[eWheelPosition];
}
}
return false;
}

void CVehicleSA::SetTaxiLightOn(bool bLightOn)
Expand Down
27 changes: 21 additions & 6 deletions Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4205,13 +4205,28 @@ bool CLuaVehicleDefs::SetVehicleModelWheelSize(const unsigned short usModel, con

int CLuaVehicleDefs::GetVehicleWheelFrictionState(CClientVehicle* pVehicle, unsigned char wheel)
{
if (wheel < 0 || wheel > 3)
throw std::invalid_argument("Invalid wheel number");
eClientVehicleType vehicleType = pVehicle->GetVehicleType();

if (CClientVehicleManager::GetVehicleType(pVehicle->GetModel()) != CLIENTVEHICLE_CAR)
throw std::invalid_argument("Invalid vehicle type");

return pVehicle->GetWheelFrictionState(wheel);
switch (vehicleType)
{
case CLIENTVEHICLE_CAR:
case CLIENTVEHICLE_MONSTERTRUCK:
case CLIENTVEHICLE_QUADBIKE:
{
if (wheel < 0 || wheel > 3)
throw std::invalid_argument("Invalid wheel number");
return pVehicle->GetWheelFrictionState(wheel);
}
case CLIENTVEHICLE_BIKE:
case CLIENTVEHICLE_BMX:
{
if (wheel < 0 || wheel > 1)
throw std::invalid_argument("Invalid wheel number");
return pVehicle->GetWheelFrictionState(wheel);
}
default:
throw std::invalid_argument("Invalid vehicle type");
}
}

std::variant<bool, CLuaMultiReturn<float, float, float>> CLuaVehicleDefs::GetVehicleModelDummyDefaultPosition(unsigned short vehicleModel,
Expand Down
Loading