Added OOP implementation for Vehicle.turnVelocity/Vehicle.setTurnVelocity

Author: jushar

MTA10/mods/shared_logic/lua/CLuaMain.cpp

@@ -309,7 +309,7 @@ void CLuaMain::AddVehicleClass ( lua_State* luaVM )
     lua_classfunction ( luaVM, "getAdjustableProperty", "getVehicleAdjustableProperty" );
     lua_classfunction ( luaVM, "getOverrideLights", "getVehicleOverrideLights" );
     lua_classfunction ( luaVM, "getPanelState", "getVehiclePanelState" );
-    lua_classfunction ( luaVM, "getTurnVelocity", "getVehicleTurnVelocity" );
+    lua_classfunction ( luaVM, "getTurnVelocity", CLuaOOPDefs::GetVehicleTurnVelocity );
     lua_classfunction ( luaVM, "isTaxiLightOn", "isVehicleTaxiLightOn" );
     lua_classfunction ( luaVM, "getComponents", "getVehicleComponents" );
     lua_classfunction ( luaVM, "getHeadLightColor", "getVehicleHeadLightColor" );
@@ -411,6 +411,7 @@ void CLuaMain::AddVehicleClass ( lua_State* luaVM )
     lua_classvariable ( luaVM, "nitroActivated", "setVehicleNitroActivated", "isVehicleNitroActivated" );
     lua_classvariable ( luaVM, "nitroRecharging", NULL, "isVehicleNitroRecharging" );
     lua_classvariable ( luaVM, "gravity", CLuaFunctionDefs::SetVehicleGravity, CLuaOOPDefs::GetVehicleGravity );
+    lua_classvariable ( luaVM, "turnVelocity", CLuaFunctionDefs::SetVehicleTurnVelocity, CLuaOOPDefs::GetVehicleTurnVelocity );
 
     //lua_classvariable ( luaVM, "color", CLuaFunctionDefs::SetVehicleColor, CLuaOOPDefs::GetVehicleColor );
     //lua_classvariable ( luaVM, "headlightColor", CLuaFunctionDefs::SetHeadLightColor, CLuaOOPDefs::GetHeadLightColor );

MTA10/mods/shared_logic/lua/oopdefs/CLuaOOPDefs.h

@@ -43,6 +43,7 @@ class CLuaOOPDefs : public CLuaDefs
 
     // Vehicle
     LUA_DECLARE ( GetVehicleGravity );
+    LUA_DECLARE ( GetVehicleTurnVelocity );
 
     // Marker
     LUA_DECLARE ( GetMarkerTarget );

MTA10/mods/shared_logic/lua/oopdefs/CLuaOOPFunctionDefs.Vehicle.cpp

@@ -31,4 +31,26 @@ int CLuaOOPDefs::GetVehicleGravity ( lua_State* luaVM )
 
     lua_pushboolean ( luaVM, false );
     return 1;
-}
+}
+
+int CLuaOOPDefs::GetVehicleTurnVelocity ( lua_State* luaVM )
+{
+    CClientVehicle* pVehicle;
+
+    CScriptArgReader argStream ( luaVM );
+    argStream.ReadUserData ( pVehicle );
+
+    if ( !argStream.HasErrors () )
+    {
+        CVector vecTurnVelocity;
+        pVehicle->GetTurnSpeed ( vecTurnVelocity );
+
+        lua_pushvector ( luaVM, vecTurnVelocity );
+        return 1;
+    }
+    else
+        m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
+
+    lua_pushboolean ( luaVM, false );
+    return 1;
+}

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

@@ -171,7 +171,7 @@ void CLuaVehicleDefs::AddClass ( lua_State* luaVM )
     lua_classfunction ( luaVM, "areSirensOn", "getVehicleSirensOn" );
     lua_classfunction ( luaVM, "getTowedByVehicle", "getVehicleTowedByVehicle" );
     lua_classfunction ( luaVM, "getTowingVehicle", "getVehicleTowingVehicle" );
-    lua_classfunction ( luaVM, "getTurnVelocity", "getVehicleTurnVelocity" );
+    lua_classfunction ( luaVM, "getTurnVelocity", "getVehicleTurnVelocity", CLuaVehicleDefs::OOP_GetVehicleTurnVelocity );
     lua_classfunction ( luaVM, "getTurretPosition", "getVehicleTurretPosition" );
     lua_classfunction ( luaVM, "getVehicleType", "getVehicleType" ); // This isn't "getType" because it would overwrite Element.getType
     lua_classfunction ( luaVM, "getUpgradeOnSlot", "getVehicleUpgradeOnSlot" );
@@ -235,7 +235,7 @@ void CLuaVehicleDefs::AddClass ( lua_State* luaVM )
     lua_classvariable ( luaVM, "maxPassengers", NULL, "getVehicleMaxPassengers" );
     lua_classvariable ( luaVM, "upgrades", NULL, "getVehicleUpgrades" );
     lua_classvariable ( luaVM, "turretPosition", "setVehicleTurretPosition", "getVehicleTurretPosition" );
-    lua_classvariable ( luaVM, "turnVelocity", "setVehicleTurnVelocity", "getVehicleTurnVelocity" );
+    lua_classvariable ( luaVM, "turnVelocity", "setVehicleTurnVelocity", "getVehicleTurnVelocity", SetVehicleTurnVelocity, OOP_GetVehicleTurnVelocity );
     lua_classvariable ( luaVM, "overrideLights", "setVehicleOverrideLights", "getVehicleOverrideLights" );
     lua_classvariable ( luaVM, "idleRespawnDelay", "setVehicleIdleRespawnDelay", NULL );
     lua_classvariable ( luaVM, "respawnDelay", "setVehicleRespawnDelay", NULL );
@@ -1039,6 +1039,30 @@ int CLuaVehicleDefs::GetVehicleTurnVelocity ( lua_State* luaVM )
 }
 
 
+int CLuaVehicleDefs::OOP_GetVehicleTurnVelocity ( lua_State* luaVM )
+{
+    CVehicle* pVehicle;
+
+    CScriptArgReader argStream ( luaVM );
+    argStream.ReadUserData ( pVehicle );
+
+    if ( !argStream.HasErrors () )
+    {
+        CVector vecTurnVelocity;
+        if ( CStaticFunctionDefinitions::GetVehicleTurnVelocity ( pVehicle, vecTurnVelocity ) )
+        {
+            lua_pushvector ( luaVM, vecTurnVelocity );
+            return 1;
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom ( luaVM, argStream.GetFullErrorMessage () );
+
+    lua_pushboolean ( luaVM, false );
+    return 1;
+}
+
+
 int CLuaVehicleDefs::GetVehicleTurretPosition ( lua_State* luaVM )
 {
     CVehicle* pVehicle;

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

@@ -36,6 +36,7 @@ class CLuaVehicleDefs : public CLuaDefs
     LUA_DECLARE ( GetVehicleRotation );
     LUA_DECLARE ( GetVehicleSirensOn );
     LUA_DECLARE ( GetVehicleTurnVelocity );
+    LUA_DECLARE ( OOP_GetVehicleTurnVelocity );
     LUA_DECLARE ( GetVehicleTurretPosition );
     LUA_DECLARE ( IsVehicleLocked );
     LUA_DECLARE ( GetVehiclesOfType );