Return vectors for vehicles component funcs (fixes mantis 9507)

Author: qaisjp

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

@@ -189,9 +189,9 @@ void CLuaVehicleDefs::AddClass ( lua_State* luaVM )
     lua_classfunction ( luaVM, "getSirenParams", "getVehicleSirenParams" );
     lua_classfunction ( luaVM, "getSirens", "getVehicleSirens" );
     lua_classfunction ( luaVM, "getSirensOn", "getVehicleSirensOn" );
-    lua_classfunction ( luaVM, "getComponentPosition", "getVehicleComponentPosition" );
+    lua_classfunction ( luaVM, "getComponentPosition", OOP_GetVehicleComponentPosition );
     lua_classfunction ( luaVM, "getComponentVisible", "getVehicleComponentVisible" );
-    lua_classfunction ( luaVM, "getComponentRotation", "getVehicleComponentRotation" );
+    lua_classfunction ( luaVM, "getComponentRotation", OOP_GetVehicleComponentRotation );
     lua_classfunction ( luaVM, "getUpgrades", "getVehicleUpgrades" );
     lua_classfunction ( luaVM, "getUpgradeSlotName", "getVehicleUpgradeSlotName" );
     lua_classfunction ( luaVM, "getCompatibleUpgrades", "getVehicleCompatibleUpgrades" );
@@ -3040,7 +3040,6 @@ int CLuaVehicleDefs::SetVehicleComponentPosition ( lua_State* luaVM )
     return 1;
 }
 
-
 int CLuaVehicleDefs::GetVehicleComponentPosition ( lua_State* luaVM )
 {
     // float, float, float getVehicleComponentPosition ( vehicle theVehicle, string theComponent [, string base = "root"] )
@@ -3071,6 +3070,34 @@ int CLuaVehicleDefs::GetVehicleComponentPosition ( lua_State* luaVM )
     return 1;
 }
 
+int CLuaVehicleDefs::OOP_GetVehicleComponentPosition ( lua_State* luaVM )
+{
+    // float, float, float getVehicleComponentPosition ( vehicle theVehicle, string theComponent [, string base = "root"] )
+    SString strComponent;
+    CClientVehicle * pVehicle = NULL;
+    EComponentBaseType outputBase;
+
+    CScriptArgReader argStream ( luaVM );
+    argStream.ReadUserData ( pVehicle );
+    argStream.ReadString ( strComponent );
+    argStream.ReadEnumString ( outputBase, EComponentBase::ROOT );
+
+    if ( !argStream.HasErrors () )
+    {
+        CVector vecPosition;
+        if ( pVehicle->GetComponentPosition ( strComponent, vecPosition, outputBase ) )
+        {
+            lua_pushvector ( luaVM, vecPosition );
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
+
+    lua_pushboolean ( luaVM, false );
+    return 1;
+}
+
 int CLuaVehicleDefs::SetVehicleComponentRotation ( lua_State* luaVM )
 {
     //  bool setVehicleComponentRotation ( vehicle theVehicle, string theComponent, float rotX, float rotY, float rotZ [, string base = "parent"] )
@@ -3132,6 +3159,36 @@ int CLuaVehicleDefs::GetVehicleComponentRotation ( lua_State* luaVM )
     return 1;
 }
 
+int CLuaVehicleDefs::OOP_GetVehicleComponentRotation ( lua_State* luaVM )
+{
+    // float, float, float getVehicleComponentRotation ( vehicle theVehicle, string theComponent [, string base = "parent"]  )
+    SString strComponent;
+    CClientVehicle * pVehicle = NULL;
+    EComponentBaseType outputBase;
+
+    CScriptArgReader argStream ( luaVM );
+    argStream.ReadUserData ( pVehicle );
+    argStream.ReadString ( strComponent );
+    argStream.ReadEnumString ( outputBase, EComponentBase::PARENT );
+
+    if ( !argStream.HasErrors () )
+    {
+        CVector vecRotation;
+        if ( pVehicle->GetComponentRotation ( strComponent, vecRotation, outputBase ) )
+        {
+            // Script uses degrees
+            ConvertRadiansToDegrees ( vecRotation );
+            lua_pushvector ( luaVM, vecRotation );
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
+
+    lua_pushboolean ( luaVM, false );
+    return 1;
+}
+
 int CLuaVehicleDefs::ResetVehicleComponentPosition ( lua_State* luaVM )
 {
     CScriptArgReader argStream ( luaVM );

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

@@ -136,9 +136,9 @@ class CLuaVehicleDefs : public CLuaDefs
 
     // Components
     LUA_DECLARE ( SetVehicleComponentPosition );
-    LUA_DECLARE ( GetVehicleComponentPosition );
+    LUA_DECLARE_OOP ( GetVehicleComponentPosition );
     LUA_DECLARE ( SetVehicleComponentRotation );
-    LUA_DECLARE ( GetVehicleComponentRotation );
+    LUA_DECLARE_OOP ( GetVehicleComponentRotation );
     LUA_DECLARE ( ResetVehicleComponentPosition );
     LUA_DECLARE ( ResetVehicleComponentRotation );
     LUA_DECLARE ( SetVehicleComponentVisible );