From be53e6fb6aba6ed7c908659b0eeb7dd308f83b17 Mon Sep 17 00:00:00 2001 From: Pirulax Date: Fri, 22 May 2020 05:34:12 +0200 Subject: [PATCH 1/2] Refactor AreVehicleLightsOn to use the new parser --- .../deathmatch/logic/luadefs/CLuaVehicleDefs.cpp | 15 +++------------ .../deathmatch/logic/luadefs/CLuaVehicleDefs.h | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index 9b818ca761c..fac5600ec33 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -36,7 +36,7 @@ void CLuaVehicleDefs::LoadFunctions() {"getVehicleDoorState", GetVehicleDoorState}, {"getVehicleLightState", GetVehicleLightState}, {"getVehiclePanelState", GetVehiclePanelState}, - {"areVehicleLightsOn", AreVehicleLightsOn}, + {"areVehicleLightsOn", ArgumentParser}, {"getVehicleOverrideLights", GetVehicleOverrideLights}, {"getVehicleTowedByVehicle", GetVehicleTowedByVehicle}, {"getVehicleTowingVehicle", GetVehicleTowingVehicle}, @@ -1009,18 +1009,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) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h index 81e60f7bba0..3729a3af913 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h +++ b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.h @@ -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); From b0ade13c11af145556c782ed92ab0e2a67b962e7 Mon Sep 17 00:00:00 2001 From: Qais Patankar Date: Sun, 31 May 2020 17:29:49 +0100 Subject: [PATCH 2/2] potentially fix build --- Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index fac5600ec33..ff481443fd7 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -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()