Requested changes

Author: Xenius97

Client/mods/deathmatch/logic/rpc/CVehicleRPCs.cpp

@@ -701,9 +701,5 @@ void CVehicleRPCs::SetVehicleSmokeTrailEnabled(CClientEntity* pSourceEntity, Net
     if (!vehicle)
         return;
 
-    std::uint16_t model = vehicle->GetModel();
-    if (model != 512 && model != 513)
-        return;
-
     vehicle->SetSmokeTrailEnabled(state);
 }

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -12668,8 +12668,3 @@ bool CStaticFunctionDefinitions::SpawnVehicleFlyingComponent(CVehicle* const veh
 
     return true;
 }
-
-bool CStaticFunctionDefinitions::IsVehicleSmokeTrailEnabled(CVehicle* const vehicle)
-{
-    return vehicle->IsSmokeTrailEnabled();
-}

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

@@ -69,7 +69,7 @@ void CLuaVehicleDefs::LoadFunctions()
         {"isVehicleBlown", ArgumentParserWarn<false, IsVehicleBlown>},
         {"getVehicleHeadLightColor", GetVehicleHeadLightColor},
         {"getVehicleDoorOpenRatio", GetVehicleDoorOpenRatio},
-        {"isVehicleSmokeTrailEnabled", IsVehicleSmokeTrailEnabled},
+        {"isVehicleSmokeTrailEnabled", ArgumentParser<IsVehicleSmokeTrailEnabled>},
 
         // Vehicle set funcs
         {"fixVehicle", FixVehicle},
@@ -3067,25 +3067,20 @@ bool CLuaVehicleDefs::SetVehicleNitroActivated(CVehicle* vehicle, bool state) no
 
 bool CLuaVehicleDefs::SetVehicleSmokeTrailEnabled(CVehicle* vehicle, bool state)
 {
+    std::uint16_t model = vehicle->GetModel();
+    if (model != 512 && model != 513)
+        return false;
+
+    vehicle->SetSmokeTrailEnabled(state);
+
     CBitStream BitStream;
     BitStream.pBitStream->WriteBit(state);
 
     m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(vehicle, SET_VEHICLE_SMOKE_TRAIL_ENABLED, *BitStream.pBitStream));
     return true;
 }
 
-int CLuaVehicleDefs::IsVehicleSmokeTrailEnabled(lua_State* luaVM)
+bool CLuaVehicleDefs::IsVehicleSmokeTrailEnabled(CVehicle* vehicle)
 {
-    CVehicle*        pVehicle;
-    CScriptArgReader argStream(luaVM);
-    argStream.ReadUserData(pVehicle);
-    if (!argStream.HasErrors())
-    {
-        lua_pushboolean(luaVM, CStaticFunctionDefinitions::IsVehicleSmokeTrailEnabled(pVehicle));
-        return 1;
-    }
-    else
-        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
-    lua_pushboolean(luaVM, false);
-    return 1;
+    return vehicle->IsSmokeTrailEnabled();
 }

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

@@ -67,7 +67,6 @@ class CLuaVehicleDefs : public CLuaDefs
     static bool IsVehicleBlown(CVehicle* vehicle);
     LUA_DECLARE(GetVehicleHeadLightColor);
     LUA_DECLARE(GetVehicleDoorOpenRatio);
-    LUA_DECLARE(IsVehicleSmokeTrailEnabled);
 
     // Vehicle set functions
     LUA_DECLARE(FixVehicle);
@@ -129,5 +128,6 @@ class CLuaVehicleDefs : public CLuaDefs
 
     static bool SpawnVehicleFlyingComponent(CVehicle* const vehicle, std::uint8_t nodeIndex, std::optional<std::uint8_t> componentCollisionType, std::optional<std::uint32_t> removalTime);
     static bool SetVehicleNitroActivated(CVehicle* vehicle, bool state) noexcept;
-    static bool SetVehicleSmokeTrailEnabled(CVehicle* vehicle, bool state) noexcept;
+    static bool SetVehicleSmokeTrailEnabled(CVehicle* vehicle, bool state);
+    static bool IsVehicleSmokeTrailEnabled(CVehicle* vehicle);
 };