fixes

Author: omar-o22

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

@@ -982,13 +982,13 @@ int CLuaVehicleDefs::GetVehicleWheelStates(lua_State* luaVM)
     return 1;
 }
 
-std::optional<unsigned char> CLuaVehicleDefs::GetVehicleWheelState(CClientVehicle* vehicle, unsigned char wheelIndex)
+std::variant<unsigned char, bool> CLuaVehicleDefs::GetVehicleWheelState(CClientVehicle* vehicle, std::uint8_t wheelIndex)
 {
     if (!vehicle)
-        return std::nullopt;
+        return false;
 
     if (wheelIndex >= MAX_WHEELS)
-        return std::nullopt;
+        return false;
 
     return vehicle->GetWheelStatus(static_cast<eWheelPosition>(wheelIndex));
 }

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

@@ -43,7 +43,7 @@ class CLuaVehicleDefs : public CLuaDefs
     LUA_DECLARE(GetVehicleUpgradeSlotName);
     LUA_DECLARE(GetVehicleCompatibleUpgrades);
     LUA_DECLARE(GetVehicleWheelStates);
-    static std::optional<unsigned char> GetVehicleWheelState(CClientVehicle* vehicle, unsigned char wheelIndex);
+    static std::variant<unsigned char, bool> GetVehicleWheelState(CClientVehicle* vehicle, std::uint8_t wheelIndex);
     LUA_DECLARE(IsVehicleWheelCollided);
     LUA_DECLARE(GetVehicleDoorState);
     LUA_DECLARE(GetVehicleLightState);

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -5284,7 +5284,7 @@ bool CStaticFunctionDefinitions::GetVehicleWheelStates(CVehicle* pVehicle, unsig
     return true;
 }
 
-bool CStaticFunctionDefinitions::GetVehicleWheelState(CVehicle* vehicle, unsigned char wheelIndex, unsigned char& wheelState)
+bool CStaticFunctionDefinitions::GetVehicleWheelState(CVehicle* vehicle, std::uint8_t wheelIndex, std::uint8_t& wheelState)
 {
     assert(vehicle);
 

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -264,7 +264,7 @@ class CStaticFunctionDefinitions
     static bool  GetVehicleDoorState(CVehicle* pVehicle, unsigned char ucDoor, unsigned char& ucState);
     static bool  GetVehicleWheelStates(CVehicle* pVehicle, unsigned char& ucFrontLeft, unsigned char& ucRearLeft, unsigned char& ucFrontRight,
                                        unsigned char& ucRearRight);
-    static bool  GetVehicleWheelState(CVehicle* vehicle, unsigned char wheelIndex, unsigned char& wheelState);
+    static bool  GetVehicleWheelState(CVehicle* vehicle, std::uint8_t wheelIndex, std::uint8_t& wheelState);
     static bool  GetVehicleLightState(CVehicle* pVehicle, unsigned char ucLight, unsigned char& ucState);
     static bool  GetVehiclePanelState(CVehicle* pVehicle, unsigned char ucPanel, unsigned char& ucState);
     static bool  GetVehicleOverrideLights(CVehicle* pVehicle, unsigned char& ucLights);

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

@@ -1322,9 +1322,9 @@ int CLuaVehicleDefs::GetVehicleWheelStates(lua_State* luaVM)
     return 1;
 }
 
-std::variant<unsigned char, bool> CLuaVehicleDefs::GetVehicleWheelState(CVehicle* vehicle, unsigned char wheelIndex)
+std::variant<std::uint8_t, bool> CLuaVehicleDefs::GetVehicleWheelState(CVehicle* vehicle, std::uint8_t wheelIndex)
 {
-    unsigned char wheelState;
+    std::uint8_t wheelState;
     if (CStaticFunctionDefinitions::GetVehicleWheelState(vehicle, wheelIndex, wheelState))
     {
         return wheelState;

Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h

@@ -46,7 +46,7 @@ class CLuaVehicleDefs : public CLuaDefs
     LUA_DECLARE(GetVehicleCompatibleUpgrades);
     LUA_DECLARE(GetVehicleDoorState);
     LUA_DECLARE(GetVehicleWheelStates);
-    static std::variant<unsigned char, bool> GetVehicleWheelState(CVehicle* vehicle, unsigned char wheelIndex);
+    static std::variant<std::uint8_t, bool> GetVehicleWheelState(CVehicle* vehicle, std::uint8_t wheelIndex);
     LUA_DECLARE(GetVehicleLightState);
     LUA_DECLARE(GetVehiclePanelState);
     LUA_DECLARE(GetVehicleOverrideLights);