Skip to content

Refactor newly added veh functions to use the new parser #1483

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

Merged
merged 2 commits into from
Jun 1, 2020
Merged

Refactor newly added veh functions to use the new parser #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be53e6f
Refactor AreVehicleLightsOn to use the new parser
Pirulax May 22, 2020
b0ade13
potentially fix build
qaisjp May 31, 2020
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
17 changes: 5 additions & 12 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 @@ -10,6 +10,8 @@
*****************************************************************************/

#include "StdInc.h"
#include "lua/CLuaFunctionParser.h"

#define MIN_CLIENT_REQ_GETVEHICLECOMPONENT_OOP "1.5.5-9.11710"

void CLuaVehicleDefs::LoadFunctions()
Expand All @@ -36,7 +38,7 @@ void CLuaVehicleDefs::LoadFunctions()
{"getVehicleDoorState", GetVehicleDoorState},
{"getVehicleLightState", GetVehicleLightState},
{"getVehiclePanelState", GetVehiclePanelState},
{"areVehicleLightsOn", AreVehicleLightsOn},
{"areVehicleLightsOn", ArgumentParser<AreVehicleLightsOn>},
{"getVehicleOverrideLights", GetVehicleOverrideLights},
{"getVehicleTowedByVehicle", GetVehicleTowedByVehicle},
{"getVehicleTowingVehicle", GetVehicleTowingVehicle},
Expand Down Expand Up @@ -1009,18 +1011,9 @@ int CLuaVehicleDefs::GetVehiclePanelState(lua_State* luaVM)
return 1;
}

int CLuaVehicleDefs::AreVehicleLightsOn(lua_State* luaVM)
bool CLuaVehicleDefs::AreVehicleLightsOn(CClientVehicle* const pVehicle)
{
CClientVehicle* pVehicle;
CScriptArgReader argStream(luaVM);
argStream.ReadUserData(pVehicle);

if (argStream.HasErrors())
return luaL_error(luaVM, argStream.GetFullErrorMessage());

bool bLightsOn = (pVehicle->AreLightsOn() || pVehicle->GetOverrideLights() == 2);
lua_pushboolean(luaVM, bLightsOn);
return 1;
return pVehicle->AreLightsOn() || pVehicle->GetOverrideLights() == 2;
}

int CLuaVehicleDefs::GetVehicleOverrideLights(lua_State* luaVM)
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class CLuaVehicleDefs : public CLuaDefs
LUA_DECLARE(GetVehicleDoorState);
LUA_DECLARE(GetVehicleLightState);
LUA_DECLARE(GetVehiclePanelState);
LUA_DECLARE(AreVehicleLightsOn);
static bool AreVehicleLightsOn(CClientVehicle* const pVehicle);
LUA_DECLARE(GetVehicleOverrideLights);
LUA_DECLARE(GetVehicleTowedByVehicle);
LUA_DECLARE(GetVehicleTowingVehicle);
Expand Down