Add getVehicleWheelState function

Author: omar-o22

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

@@ -49,6 +49,7 @@ void CLuaVehicleDefs::LoadFunctions()
         {"getVehiclePaintjob", GetVehiclePaintjob},
         {"getVehiclePlateText", GetVehiclePlateText},
         {"getVehicleWheelStates", GetVehicleWheelStates},
+        {"getVehicleWheelState", GetVehicleWheelState},
         {"isVehicleWheelOnGround", IsVehicleWheelCollided},
         {"isVehicleDamageProof", IsVehicleDamageProof},
         {"isVehicleFuelTankExplodable", IsVehicleFuelTankExplodable},
@@ -223,6 +224,7 @@ void CLuaVehicleDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "getPaintjob", "getVehiclePaintjob");
     lua_classfunction(luaVM, "getTurretPosition", "getVehicleTurretPosition");
     lua_classfunction(luaVM, "getWheelStates", "getVehicleWheelStates");
+    lua_classfunction(luaVM, "getWheelState", "getVehicleWheelState");
     lua_classfunction(luaVM, "isWheelOnGround", "isVehicleWheelOnGround");
     lua_classfunction(luaVM, "getDoorOpenRatio", "getVehicleDoorOpenRatio");
     lua_classfunction(luaVM, "getVariant", "getVehicleVariant");
@@ -980,6 +982,48 @@ int CLuaVehicleDefs::GetVehicleWheelStates(lua_State* luaVM)
     return 1;
 }
 
+int CLuaVehicleDefs::GetVehicleWheelState(lua_State* luaVM)
+{
+    CClientVehicle*  pVehicle = nullptr;
+    unsigned char    ucWheel = 0;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pVehicle);
+    argStream.ReadNumber(ucWheel);
+
+    if (!argStream.HasErrors() && pVehicle)
+    {
+        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;
+    }
+    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,6 +43,7 @@ class CLuaVehicleDefs : public CLuaDefs
     LUA_DECLARE(GetVehicleUpgradeSlotName);
     LUA_DECLARE(GetVehicleCompatibleUpgrades);
     LUA_DECLARE(GetVehicleWheelStates);
+    LUA_DECLARE(GetVehicleWheelState);
     LUA_DECLARE(IsVehicleWheelCollided);
     LUA_DECLARE(GetVehicleDoorState);
     LUA_DECLARE(GetVehicleLightState);

Server/mods/deathmatch/logic/CResourceChecker.Data.h

@@ -91,6 +91,7 @@ namespace
         {false, "getVehicleID", "getElementModel"},
         {false, "getVehicleRotation", "getElementRotation"},
         {false, "getVehicleNameFromID", "getVehicleNameFromModel"},
+        {false, "getVehicleWheelStates", "getVehicleWheelState"},
         {false, "setVehicleRotation", "setElementRotation"},
         {false, "attachElementToElement", "attachElements"},
         {false, "detachElementFromElement", "detachElements"},
@@ -155,6 +156,7 @@ namespace
         {false, "getVehicleID", "getElementModel"},
         {false, "getVehicleIDFromName", "getVehicleModelFromName"},
         {false, "getVehicleNameFromID", "getVehicleNameFromModel"},
+        {false, "getVehicleWheelStates", "getVehicleWheelState"},
         {false, "getPlayerWeaponSlot", "getPedWeaponSlot"},
         {false, "getPlayerWeapon", "getPedWeapon"},
         {false, "getPlayerTotalAmmo", "getPedTotalAmmo"},

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

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

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -264,6 +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  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,6 +48,7 @@ void CLuaVehicleDefs::LoadFunctions()
         {"getVehicleCompatibleUpgrades", GetVehicleCompatibleUpgrades},
         {"getVehicleDoorState", GetVehicleDoorState},
         {"getVehicleWheelStates", GetVehicleWheelStates},
+        {"getVehicleWheelState", GetVehicleWheelState},
         {"getVehicleLightState", GetVehicleLightState},
         {"getVehiclePanelState", GetVehiclePanelState},
         {"getVehicleOverrideLights", GetVehicleOverrideLights},
@@ -202,6 +203,7 @@ void CLuaVehicleDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "getUpgradeOnSlot", "getVehicleUpgradeOnSlot");
     lua_classfunction(luaVM, "getUpgrades", "getVehicleUpgrades");
     lua_classfunction(luaVM, "getWheelStates", "getVehicleWheelStates");
+    lua_classfunction(luaVM, "getWheelState", "getVehicleWheelState");
     lua_classfunction(luaVM, "getDoorOpenRatio", "getVehicleDoorOpenRatio");
     lua_classfunction(luaVM, "getHandling", "getVehicleHandling");
     lua_classfunction(luaVM, "getRespawnPosition", "getVehicleRespawnPosition");
@@ -1320,6 +1322,31 @@ int CLuaVehicleDefs::GetVehicleWheelStates(lua_State* luaVM)
     return 1;
 }
 
+int CLuaVehicleDefs::GetVehicleWheelState(lua_State* luaVM)
+{
+    CVehicle* pVehicle;
+    unsigned char ucWheel = 0;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pVehicle);
+    argStream.ReadNumber(ucWheel);
+
+    if (!argStream.HasErrors() && pVehicle)
+    {
+        unsigned char ucState;
+        if (CStaticFunctionDefinitions::GetVehicleWheelState(pVehicle, ucWheel, ucState))
+        {
+            lua_pushnumber(luaVM, ucState);
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    lua_pushboolean(luaVM, false);
+    return 1;
+}
+
 int CLuaVehicleDefs::GetVehicleLightState(lua_State* luaVM)
 {
     CVehicle*     pVehicle;

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

@@ -46,6 +46,7 @@ class CLuaVehicleDefs : public CLuaDefs
     LUA_DECLARE(GetVehicleCompatibleUpgrades);
     LUA_DECLARE(GetVehicleDoorState);
     LUA_DECLARE(GetVehicleWheelStates);
+    LUA_DECLARE(GetVehicleWheelState);
     LUA_DECLARE(GetVehicleLightState);
     LUA_DECLARE(GetVehiclePanelState);
     LUA_DECLARE(GetVehicleOverrideLights);