fixes

Author: omar-o22

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

@@ -49,7 +49,7 @@ void CLuaVehicleDefs::LoadFunctions()
         {"getVehiclePaintjob", GetVehiclePaintjob},
         {"getVehiclePlateText", GetVehiclePlateText},
         {"getVehicleWheelStates", GetVehicleWheelStates},
-        {"getVehicleWheelState", GetVehicleWheelState},
+        {"getVehicleWheelState", ArgumentParser<GetVehicleWheelState>},
         {"isVehicleWheelOnGround", IsVehicleWheelCollided},
         {"isVehicleDamageProof", IsVehicleDamageProof},
         {"isVehicleFuelTankExplodable", IsVehicleFuelTankExplodable},
@@ -982,48 +982,23 @@ int CLuaVehicleDefs::GetVehicleWheelStates(lua_State* luaVM)
     return 1;
 }
 
-int CLuaVehicleDefs::GetVehicleWheelState(lua_State* luaVM)
+std::variant<unsigned char, bool> CLuaVehicleDefs::GetVehicleWheelState(CClientVehicle* vehicle, unsigned char wheelIndex)
 {
-    CClientVehicle*  pVehicle = nullptr;
-    unsigned char    ucWheel = 0;
-
-    CScriptArgReader argStream(luaVM);
-    argStream.ReadUserData(pVehicle);
-    argStream.ReadNumber(ucWheel);
+    if (!vehicle)
+        return std::nullopt;
 
-    if (!argStream.HasErrors() && pVehicle)
+    switch (wheelIndex)
     {
-        unsigned char ucState = 0;
-        
-        switch (ucWheel)
-        {
-        case 1:
-            ucState = pVehicle->GetWheelStatus(FRONT_LEFT_WHEEL);
-            break;
-        case 2:
-            ucState = pVehicle->GetWheelStatus(REAR_LEFT_WHEEL);
-            break;
-        case 3:
-            ucState = pVehicle->GetWheelStatus(FRONT_RIGHT_WHEEL);
-            break;
-        case 4:
-            ucState = pVehicle->GetWheelStatus(REAR_RIGHT_WHEEL);
-            break;
-        default:
-            lua_pushboolean(luaVM, false);
-            return 1;
-        }
-
-        lua_pushnumber(luaVM, ucState);
-        return 1;
+        case 1: return vehicle->GetWheelStatus(FRONT_LEFT_WHEEL);
+        case 2: return vehicle->GetWheelStatus(REAR_LEFT_WHEEL);
+        case 3: return vehicle->GetWheelStatus(FRONT_RIGHT_WHEEL);
+        case 4: return vehicle->GetWheelStatus(REAR_RIGHT_WHEEL);
+    default:
+        return std::nullopt;
     }
-    else
-        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
-
-    lua_pushboolean(luaVM, false);
-    return 1;
 }
 
+
 int CLuaVehicleDefs::IsVehicleWheelCollided(lua_State* luaVM)
 {
     CClientVehicle*  pVehicle = nullptr;

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

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

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -5284,23 +5284,23 @@ bool CStaticFunctionDefinitions::GetVehicleWheelStates(CVehicle* pVehicle, unsig
     return true;
 }
 
-bool CStaticFunctionDefinitions::GetVehicleWheelState(CVehicle* pVehicle, unsigned char& ucWheel, unsigned char& ucState)
+bool CStaticFunctionDefinitions::GetVehicleWheelState(CVehicle* vehicle, unsigned char wheelIndex, unsigned char& wheelState)
 {
-    assert(pVehicle);
+    assert(vehicle);
 
-    switch(ucWheel)
+    switch(wheelIndex)
     {
         case 1:
-            ucState = pVehicle->m_ucWheelStates[FRONT_LEFT_WHEEL];
+            wheelState = vehicle->m_ucWheelStates[FRONT_LEFT_WHEEL];
             break;
         case 2:
-            ucState = pVehicle->m_ucWheelStates[REAR_LEFT_WHEEL];
+            wheelState = vehicle->m_ucWheelStates[REAR_LEFT_WHEEL];
             break;
         case 3:
-            ucState = pVehicle->m_ucWheelStates[FRONT_RIGHT_WHEEL];
+            wheelState = vehicle->m_ucWheelStates[FRONT_RIGHT_WHEEL];
             break;
         case 4:
-            ucState = pVehicle->m_ucWheelStates[REAR_RIGHT_WHEEL];
+            wheelState = vehicle->m_ucWheelStates[REAR_RIGHT_WHEEL];
             break;
         default:
             return false;

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* pVehicle, unsigned char& ucWheel, unsigned char& ucState);
+    static bool  GetVehicleWheelState(CVehicle* vehicle, unsigned char wheelIndex, unsigned char& 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

@@ -48,7 +48,7 @@ void CLuaVehicleDefs::LoadFunctions()
         {"getVehicleCompatibleUpgrades", GetVehicleCompatibleUpgrades},
         {"getVehicleDoorState", GetVehicleDoorState},
         {"getVehicleWheelStates", GetVehicleWheelStates},
-        {"getVehicleWheelState", GetVehicleWheelState},
+        {"getVehicleWheelState", ArgumentParser<GetVehicleWheelState>},
         {"getVehicleLightState", GetVehicleLightState},
         {"getVehiclePanelState", GetVehiclePanelState},
         {"getVehicleOverrideLights", GetVehicleOverrideLights},
@@ -1322,29 +1322,14 @@ int CLuaVehicleDefs::GetVehicleWheelStates(lua_State* luaVM)
     return 1;
 }
 
-int CLuaVehicleDefs::GetVehicleWheelState(lua_State* luaVM)
+std::variant<unsigned char, bool> CLuaVehicleDefs::GetVehicleWheelState(CVehicle* vehicle, unsigned char wheelIndex)
 {
-    CVehicle* pVehicle;
-    unsigned char ucWheel = 0;
-
-    CScriptArgReader argStream(luaVM);
-    argStream.ReadUserData(pVehicle);
-    argStream.ReadNumber(ucWheel);
-
-    if (!argStream.HasErrors() && pVehicle)
+    unsigned char wheelState
+    if (CStaticFunctionDefinitions::GetVehicleWheelState(vehicle, wheelIndex, wheelState))
     {
-        unsigned char ucState;
-        if (CStaticFunctionDefinitions::GetVehicleWheelState(pVehicle, ucWheel, ucState))
-        {
-            lua_pushnumber(luaVM, ucState);
-            return 1;
-        }
+        return wheelState;
     }
-    else
-        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
-
-    lua_pushboolean(luaVM, false);
-    return 1;
+    return false;
 }
 
 int CLuaVehicleDefs::GetVehicleLightState(lua_State* luaVM)
@@ -3086,4 +3071,4 @@ bool CLuaVehicleDefs::SetVehicleNitroActivated(CVehicle* vehicle, bool state) no
 
     m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(vehicle, SET_VEHICLE_NITRO_ACTIVATED, *BitStream.pBitStream));
     return true;
-}
+}

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

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