Skip to content

Add getVehicleWheelState function #4468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Add getVehicleWheelState function #4468

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
70ebb5b
Add getVehicleWheelState function
omar-o22 Sep 15, 2025
4d3b191
fixes
omar-o22 Sep 16, 2025
015c543
Remove space added by mistake
omar-o22 Sep 17, 2025
829891d
Merge branch 'master' into feature/add-getVehicleWheelState-function
omar-o22 Sep 22, 2025
e3099fa
fixes
omar-o22 Sep 22, 2025
0a6820e
fixes wrong syntax
omar-o22 Sep 22, 2025
4bf1088
fixes
omar-o22 Sep 23, 2025
8233cbd
Merge branch 'master' into feature/add-getVehicleWheelState-function
omar-o22 Sep 23, 2025
6d46f38
Merge branch 'master' into feature/add-getVehicleWheelState-function
omar-o22 Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ void CLuaVehicleDefs::LoadFunctions()
{"getVehiclePaintjob", GetVehiclePaintjob},
{"getVehiclePlateText", GetVehiclePlateText},
{"getVehicleWheelStates", GetVehicleWheelStates},
{"getVehicleWheelState", GetVehicleWheelState},
{"isVehicleWheelOnGround", IsVehicleWheelCollided},
{"isVehicleDamageProof", IsVehicleDamageProof},
{"isVehicleFuelTankExplodable", IsVehicleFuelTankExplodable},
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions Server/mods/deathmatch/logic/CResourceChecker.Data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down Expand Up @@ -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"},
Expand Down
25 changes: 25 additions & 0 deletions Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
27 changes: 27 additions & 0 deletions Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ void CLuaVehicleDefs::LoadFunctions()
{"getVehicleCompatibleUpgrades", GetVehicleCompatibleUpgrades},
{"getVehicleDoorState", GetVehicleDoorState},
{"getVehicleWheelStates", GetVehicleWheelStates},
{"getVehicleWheelState", GetVehicleWheelState},
{"getVehicleLightState", GetVehicleLightState},
{"getVehiclePanelState", GetVehiclePanelState},
{"getVehicleOverrideLights", GetVehicleOverrideLights},
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down