Refactor vehicle wheel friction state retrieval for improved validation

Author: Xenius97

Client/game_sa/CVehicleSA.cpp

@@ -1476,21 +1476,14 @@ int CVehicleSA::GetWheelFrictionState(BYTE eWheelPosition)
         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)

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

@@ -4205,23 +4205,20 @@ bool CLuaVehicleDefs::SetVehicleModelWheelSize(const unsigned short usModel, con
 
 int CLuaVehicleDefs::GetVehicleWheelFrictionState(CClientVehicle* pVehicle, unsigned char wheel)
 {
-    eClientVehicleType vehicleType = pVehicle->GetVehicleType();
+    if (wheel >= MAX_WHEELS)
+        throw std::invalid_argument("Invalid wheel number");
 
-    switch (vehicleType)
+    switch (pVehicle->GetVehicleType())
     {
         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: