Skip to content

Commit bd7691a

Browse files
committed
Refactor GetVehicleWheelFrictionState to simplify vehicle type checks
1 parent ff10df1 commit bd7691a

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4208,22 +4208,15 @@ int CLuaVehicleDefs::GetVehicleWheelFrictionState(CClientVehicle* pVehicle, unsi
42084208
if (wheel >= MAX_WHEELS)
42094209
throw std::invalid_argument("Invalid wheel number");
42104210

4211-
switch (pVehicle->GetVehicleType())
4211+
auto vehicleType = pVehicle->GetVehicleType();
4212+
4213+
if (vehicleType == CLIENTVEHICLE_CAR || vehicleType == CLIENTVEHICLE_MONSTERTRUCK || vehicleType == CLIENTVEHICLE_QUADBIKE ||
4214+
vehicleType == CLIENTVEHICLE_BIKE || vehicleType == CLIENTVEHICLE_BMX)
42124215
{
4213-
case CLIENTVEHICLE_CAR:
4214-
case CLIENTVEHICLE_MONSTERTRUCK:
4215-
case CLIENTVEHICLE_QUADBIKE:
4216-
{
4217-
return pVehicle->GetWheelFrictionState(wheel);
4218-
}
4219-
case CLIENTVEHICLE_BIKE:
4220-
case CLIENTVEHICLE_BMX:
4221-
{
4222-
return pVehicle->GetWheelFrictionState(wheel);
4223-
}
4224-
default:
4225-
throw std::invalid_argument("Invalid vehicle type");
4216+
return pVehicle->GetWheelFrictionState(wheel);
42264217
}
4218+
4219+
throw std::invalid_argument("Invalid vehicle type");
42274220
}
42284221

42294222
std::variant<bool, CLuaMultiReturn<float, float, float>> CLuaVehicleDefs::GetVehicleModelDummyDefaultPosition(unsigned short vehicleModel,

0 commit comments

Comments
 (0)