Merge pull request #225 from patrikjuvonen/issue-9898

0009898: add setVehicleModelExhaustFumesPosition and getVehicleModelExhaustFumesPosition OOP methods

Author: qaisjp

Client/mods/deathmatch/logic/CClientVehicle.cpp

@@ -4724,22 +4724,6 @@ bool CClientVehicle::DoesSupportUpgrade(const SString& strFrameName)
     return true;
 }
 
-void CClientVehicle::SetModelExhaustFumesPosition(unsigned short modelID, const CVector& position)
-{
-    auto pModelInfo = g_pGame->GetModelInfo(modelID);
-    if (pModelInfo)
-        pModelInfo->SetVehicleExhaustFumesPosition(position);
-}
-
-CVector CClientVehicle::GetModelExhaustFumesPosition(unsigned short modelID)
-{
-    auto pModelInfo = g_pGame->GetModelInfo(modelID);
-    if (pModelInfo)
-        return pModelInfo->GetVehicleExhaustFumesPosition();
-
-    return CVector();
-}
-
 bool CClientVehicle::OnVehicleFallThroughMap()
 {
     // if we have fallen through the map a small number of times

Client/mods/deathmatch/logic/CClientVehicle.h

@@ -484,9 +484,6 @@ class CClientVehicle : public CClientStreamElement
 
     void SetHeliBladeCollisionsEnabled(bool bEnable) { m_bEnableHeliBladeCollisions = bEnable; }
 
-    static void    SetModelExhaustFumesPosition(unsigned short modelID, const CVector& position);
-    static CVector GetModelExhaustFumesPosition(unsigned short modelID);
-
     bool OnVehicleFallThroughMap();
 
 protected:

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -3414,6 +3414,34 @@ bool CStaticFunctionDefinitions::IsVehicleWindowOpen(CClientVehicle& Vehicle, uc
     return Vehicle.IsWindowOpen(ucWindow);
 }
 
+bool CStaticFunctionDefinitions::SetVehicleModelExhaustFumesPosition(unsigned short usModel, CVector& vecPosition)
+{
+    if (CClientVehicleManager::IsValidModel(usModel))
+    {
+        auto pModelInfo = g_pGame->GetModelInfo(usModel);
+        if (pModelInfo)
+        {
+            pModelInfo->SetVehicleExhaustFumesPosition(vecPosition);
+            return true;
+        }
+    }
+    return false;
+}
+
+bool CStaticFunctionDefinitions::GetVehicleModelExhaustFumesPosition(unsigned short usModel, CVector& vecPosition)
+{
+    if (CClientVehicleManager::IsValidModel(usModel))
+    {
+        auto pModelInfo = g_pGame->GetModelInfo(usModel);
+        if (pModelInfo)
+        {
+            vecPosition = pModelInfo->GetVehicleExhaustFumesPosition();
+            return true;
+        }
+    }
+    return false;
+}
+
 bool CStaticFunctionDefinitions::SetElementCollisionsEnabled(CClientEntity& Entity, bool bEnabled)
 {
     switch (Entity.GetType())

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -218,6 +218,8 @@ class CStaticFunctionDefinitions
     static bool            GetVehicleNitroLevel(CClientVehicle& Vehicle, float& fLevel);
     static bool            GetHeliBladeCollisionsEnabled(CClientVehicle& Vehicle);
     static bool            IsVehicleWindowOpen(CClientVehicle& Vehicle, uchar ucWindow);
+    static bool            SetVehicleModelExhaustFumesPosition(unsigned short usModel, CVector& vecPosition);
+    static bool            GetVehicleModelExhaustFumesPosition(unsigned short usModel, CVector& vecPosition);
 
     // Vehicle set functions
     static bool FixVehicle(CClientEntity& Entity);

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

@@ -205,6 +205,7 @@ void CLuaVehicleDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "getUpgradeSlotName", "getVehicleUpgradeSlotName");
     lua_classfunction(luaVM, "getCompatibleUpgrades", "getVehicleCompatibleUpgrades");
     lua_classfunction(luaVM, "getUpgradeOnSlot", "getVehicleUpgradeOnSlot");
+    lua_classfunction(luaVM, "getModelExhaustFumesPosition", OOP_GetVehicleModelExhaustFumesPosition);
 
     lua_classfunction(luaVM, "setComponentVisible", "setVehicleComponentVisible");
     lua_classfunction(luaVM, "setSirensOn", "setVehicleSirensOn");
@@ -245,6 +246,7 @@ void CLuaVehicleDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "setColor", "setVehicleColor");
     lua_classfunction(luaVM, "setPlateText", "setVehiclePlateText");
     lua_classfunction(luaVM, "setGravity", "setVehicleGravity");
+    lua_classfunction(luaVM, "setModelExhaustFumesPosition", "setVehicleModelExhaustFumesPosition");
 
     lua_classfunction(luaVM, "resetComponentPosition", "resetVehicleComponentPosition");
     lua_classfunction(luaVM, "resetComponentRotation", "resetVehicleComponentRotation");
@@ -3751,20 +3753,21 @@ int CLuaVehicleDefs::IsVehicleWindowOpen(lua_State* luaVM)
 
 int CLuaVehicleDefs::SetVehicleModelExhaustFumesPosition(lua_State* luaVM)
 {
-    // bool setVehicleModelExhaustPosition(int modelID, float x, float y, float z)
-    unsigned short modelID;
-    CVector        position;
+    // bool setVehicleModelExhaustPosition ( int modelID, float x, float y, float z )
+    unsigned short usModel;
+    CVector        vecPosition;
 
     CScriptArgReader argStream(luaVM);
-    argStream.ReadNumber(modelID);
-    argStream.ReadVector3D(position);
+    argStream.ReadNumber(usModel);
+    argStream.ReadVector3D(vecPosition);
 
     if (!argStream.HasErrors())
     {
-        CClientVehicle::SetModelExhaustFumesPosition(modelID, position);
-
-        lua_pushboolean(luaVM, true);
-        return 1;
+        if (CStaticFunctionDefinitions::SetVehicleModelExhaustFumesPosition(usModel, vecPosition))
+        {
+            lua_pushboolean(luaVM, true);
+            return 1;
+        }
     }
     else
         m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
@@ -3775,20 +3778,48 @@ int CLuaVehicleDefs::SetVehicleModelExhaustFumesPosition(lua_State* luaVM)
 
 int CLuaVehicleDefs::GetVehicleModelExhaustFumesPosition(lua_State* luaVM)
 {
-    // bool getVehicleModelExhaustPosition(int modelID)
-    unsigned short modelID;
+    // float, float, float getVehicleModelExhaustPosition ( int modelID )
+    unsigned short usModel;
 
     CScriptArgReader argStream(luaVM);
-    argStream.ReadNumber(modelID);
+    argStream.ReadNumber(usModel);
 
     if (!argStream.HasErrors())
     {
-        CVector position = CClientVehicle::GetModelExhaustFumesPosition(modelID);
+        CVector vecPosition;
+        
+        if (CStaticFunctionDefinitions::GetVehicleModelExhaustFumesPosition(usModel, vecPosition))
+        {
+            lua_pushnumber(luaVM, vecPosition.fX);
+            lua_pushnumber(luaVM, vecPosition.fY);
+            lua_pushnumber(luaVM, vecPosition.fZ);
+            return 3;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
 
-        lua_pushnumber(luaVM, position.fX);
-        lua_pushnumber(luaVM, position.fY);
-        lua_pushnumber(luaVM, position.fZ);
-        return 3;
+    lua_pushboolean(luaVM, false);
+    return 1;
+}
+
+int CLuaVehicleDefs::OOP_GetVehicleModelExhaustFumesPosition(lua_State* luaVM)
+{
+    // float, float, float getVehicleModelExhaustPosition ( int modelID )
+    unsigned short usModel;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadNumber(usModel);
+
+    if (!argStream.HasErrors())
+    {
+        CVector vecPosition;
+        
+        if (CStaticFunctionDefinitions::GetVehicleModelExhaustFumesPosition(usModel, vecPosition))
+        {
+            lua_pushvector(luaVM, vecPosition);
+            return 1;
+        }
     }
     else
         m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());

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

@@ -137,7 +137,7 @@ class CLuaVehicleDefs : public CLuaDefs
     LUA_DECLARE(SetVehicleWindowOpen);
 
     LUA_DECLARE(SetVehicleModelExhaustFumesPosition);
-    LUA_DECLARE(GetVehicleModelExhaustFumesPosition);
+    LUA_DECLARE_OOP(GetVehicleModelExhaustFumesPosition);
 
     // Components
     LUA_DECLARE(SetVehicleComponentPosition);