Clean up client Ped luadefs

Author: qaisjp

MTA10/mods/deathmatch/StdInc.h

@@ -106,6 +106,7 @@
 #include <CScriptArgReader.h>
 #include <luadefs/CLuaDefs.h>
 #include <luadefs/CLuaClassDefs.h>
+#include <luadefs/CLuaPedDefs.h>
 #include <luadefs/CLuaVector2Defs.h>
 #include <luadefs/CLuaVector3Defs.h>
 #include <luadefs/CLuaVector4Defs.h>

MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj

@@ -365,6 +365,7 @@
     <ClCompile Include="..\shared_logic\CClientSearchLight.cpp" />
     <ClCompile Include="..\shared_logic\CClientPointLights.cpp" />
     <ClCompile Include="..\shared_logic\CClientPointLightsManager.cpp" />
+    <ClCompile Include="..\shared_logic\luadefs\CLuaPedDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaSearchLightDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaVector2Defs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaVector3Defs.cpp" />
@@ -575,7 +576,6 @@
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Marker.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Object.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Output.cpp" />
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Ped.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Pickup.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Player.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Projectile.cpp" />
@@ -599,7 +599,6 @@
     <ClCompile Include="..\shared_logic\lua\LuaCommon.cpp" />
     <ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Camera.cpp" />
     <ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Element.cpp" />
-    <ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Ped.cpp" />
     <ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Vehicle.cpp" />
     <ClCompile Include="..\..\..\vendor\bochs\bochs_internal\crc32.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaClassDefs.cpp" />
@@ -762,6 +761,7 @@
     <ClInclude Include="..\shared_logic\CClientSearchLight.h" />
     <ClInclude Include="..\shared_logic\CClientPointLights.h" />
     <ClInclude Include="..\shared_logic\CClientPointLightsManager.h" />
+    <ClInclude Include="..\shared_logic\luadefs\CLuaPedDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaSearchLightDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaVector2Defs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaVector3Defs.h" />

MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj.filters

@@ -614,9 +614,6 @@
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Output.cpp">
       <Filter>Source Files\shared_logic\lua</Filter>
     </ClCompile>
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Ped.cpp">
-      <Filter>Source Files\shared_logic\lua</Filter>
-    </ClCompile>
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Pickup.cpp">
       <Filter>Source Files\shared_logic\lua</Filter>
     </ClCompile>
@@ -686,9 +683,6 @@
     <ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Element.cpp">
       <Filter>Source Files\shared_logic\lua\oopdefs</Filter>
     </ClCompile>
-    <ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Ped.cpp">
-      <Filter>Source Files\shared_logic\lua\oopdefs</Filter>
-    </ClCompile>
     <ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Vehicle.cpp">
       <Filter>Source Files\shared_logic\lua\oopdefs</Filter>
     </ClCompile>
@@ -944,6 +938,9 @@
     <ClCompile Include="..\shared_logic\luadefs\CLuaSearchLightDefs.cpp">
       <Filter>Source Files\shared_logic\luadefs</Filter>
     </ClCompile>
+    <ClCompile Include="..\shared_logic\luadefs\CLuaPedDefs.cpp">
+      <Filter>Source Files\shared_logic\luadefs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CClient.h">
@@ -1669,5 +1666,8 @@
     <ClInclude Include="..\shared_logic\luadefs\CLuaSearchLightDefs.h">
       <Filter>Header Files\shared_logic\luadefs</Filter>
     </ClInclude>
+    <ClInclude Include="..\shared_logic\luadefs\CLuaPedDefs.h">
+      <Filter>Header Files\shared_logic\luadefs</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h

@@ -217,81 +217,6 @@ class CLuaFunctionDefs
     LUA_DECLARE ( SetPlayerNametagColor );
     LUA_DECLARE ( SetPlayerNametagShowing );
 
-    // Ped funcs
-    LUA_DECLARE ( CreatePed );
-
-    LUA_DECLARE ( DetonateSatchels );
-
-    LUA_DECLARE ( GetPedVoice );
-    LUA_DECLARE ( SetPedVoice );
-    LUA_DECLARE ( GetPedTarget );
-    LUA_DECLARE ( GetPedTargetStart );
-    LUA_DECLARE ( GetPedTargetEnd );
-    LUA_DECLARE ( GetPedTargetRange );
-    LUA_DECLARE ( GetPedTargetCollision );
-    LUA_DECLARE ( GetPedWeaponSlot );
-    LUA_DECLARE ( GetPedWeapon );
-    LUA_DECLARE ( GetPedAmmoInClip );
-    LUA_DECLARE ( GetPedTotalAmmo );
-    LUA_DECLARE ( GetPedWeaponMuzzlePosition );
-    LUA_DECLARE ( GetPedStat );
-    LUA_DECLARE ( GetPedOccupiedVehicle );
-    LUA_DECLARE ( GetPedOccupiedVehicleSeat );
-    LUA_DECLARE ( GetPedArmor );
-    LUA_DECLARE ( IsPedChoking );
-    LUA_DECLARE ( IsPedDucked );
-    LUA_DECLARE ( IsPedInVehicle );
-    LUA_DECLARE ( DoesPedHaveJetPack );
-    LUA_DECLARE ( IsPedOnGround );
-    LUA_DECLARE ( GetPedTask );
-    LUA_DECLARE ( GetPedSimplestTask );
-    LUA_DECLARE ( IsPedDoingTask );
-    LUA_DECLARE ( GetPedContactElement );
-    LUA_DECLARE ( GetPedRotation );
-    LUA_DECLARE ( CanPedBeKnockedOffBike );
-    LUA_DECLARE ( GetPedBonePosition );
-    LUA_DECLARE ( GetPedClothes );
-    LUA_DECLARE ( GetPedControlState );
-    LUA_DECLARE ( GetPedAnalogControlState );
-    LUA_DECLARE ( IsPedSunbathing );
-    LUA_DECLARE ( IsPedDoingGangDriveby );
-    LUA_DECLARE ( GetPedAnimation );
-    LUA_DECLARE ( GetPedMoveState );
-    LUA_DECLARE ( GetPedMoveAnim );
-    LUA_DECLARE ( IsPedHeadless );
-    LUA_DECLARE ( IsPedFrozen );
-    LUA_DECLARE ( IsPedFootBloodEnabled );
-    LUA_DECLARE ( GetPedCameraRotation );
-    LUA_DECLARE ( IsPedOnFire );
-    LUA_DECLARE ( GetWeaponProperty );
-    LUA_DECLARE ( GetOriginalWeaponProperty );
-    LUA_DECLARE ( GetPedOxygenLevel );
-    LUA_DECLARE ( IsPedDead );
-
-    LUA_DECLARE ( SetPedRotation );
-    LUA_DECLARE ( SetPedCanBeKnockedOffBike );
-    LUA_DECLARE ( SetPedAnimation );
-    LUA_DECLARE ( SetPedAnimationProgress );
-    LUA_DECLARE ( SetPedMoveAnim );
-    LUA_DECLARE ( SetPedWeaponSlot );
-    LUA_DECLARE ( GivePedWeapon );
-    LUA_DECLARE ( AddPedClothes );
-    LUA_DECLARE ( RemovePedClothes );
-    LUA_DECLARE ( SetPedControlState );
-    LUA_DECLARE ( SetPedAnalogControlState );
-    LUA_DECLARE ( SetPedSunbathing );
-    LUA_DECLARE ( SetPedDoingGangDriveby );
-    LUA_DECLARE ( SetPedLookAt );
-    LUA_DECLARE ( SetPedHeadless );
-    LUA_DECLARE ( SetPedFrozen );
-    LUA_DECLARE ( SetPedFootBloodEnabled );
-    LUA_DECLARE ( SetPedCameraRotation );
-    LUA_DECLARE ( SetPedAimTarget );
-    LUA_DECLARE ( SetPedOnFire );
-    LUA_DECLARE ( WarpPedIntoVehicle );
-    LUA_DECLARE ( RemovePedFromVehicle );
-    LUA_DECLARE ( SetPedOxygenLevel );
-
     // Clothes and body functions
     LUA_DECLARE ( GetBodyPartName );
     LUA_DECLARE ( GetClothesByTypeIndex );

MTA10/mods/shared_logic/lua/CLuaMain.cpp

@@ -421,122 +421,6 @@ void CLuaMain::AddVehicleClass ( lua_State* luaVM )
 }
 
 
-// TODO: special tables
-void CLuaMain::AddPedClass ( lua_State* luaVM )
-{
-    lua_newclass ( luaVM );
-
-    lua_classfunction ( luaVM, "create", "createPed" );
-
-    lua_classfunction ( luaVM, "getBodyPartName", "getBodyPartName" );
-    lua_classfunction ( luaVM, "getClothesTypeName", "getClothesTypeName" );
-    lua_classfunction ( luaVM, "getValidModels", "getValidPedModels" );
-    lua_classfunction ( luaVM, "getTypeIndexFromClothes", "getTypeIndexFromClothes" );
-    lua_classfunction ( luaVM, "getClothesByTypeIndex", "getClothesByTypeIndex" );
-    lua_classvariable ( luaVM, "validModels", NULL, "getValidPedModels" );
-    //lua_classvariable ( luaVM, "clothesTypeName", NULL, "getClothesTypeName" ); table
-    //lua_classvariable ( luaVM, "bodyPartName", NULL, "getBodyPartName" ); table
-    
-    lua_classfunction ( luaVM, "canBeKnockedOffBike", "canPedBeKnockedOffBike" );
-    lua_classfunction ( luaVM, "doesHaveJetPack", "doesPedHaveJetPack" );
-    lua_classfunction ( luaVM, "getAmmoInClip", "getPedAmmoInClip" );
-    lua_classfunction ( luaVM, "getAnalogControlState", "getPedAnalogControlState");
-    lua_classfunction ( luaVM, "getAnimation", "getPedAnimation" );
-    lua_classfunction ( luaVM, "getArmor", "getPedArmor" );
-    lua_classfunction ( luaVM, "getClothes", "getPedClothes" );
-    lua_classfunction ( luaVM, "addClothes", "addPedClothes" );
-    lua_classfunction ( luaVM, "removeClothes", "removePedClothes" );
-    lua_classfunction ( luaVM, "getContactElement", "getPedContactElement" );
-    lua_classfunction ( luaVM, "getControlState", "getPedControlState" );
-    lua_classfunction ( luaVM, "getMoveState", "getPedMoveState" );
-    lua_classfunction ( luaVM, "getOccupiedVehicle", "getPedOccupiedVehicle" );
-    lua_classfunction ( luaVM, "getOccupiedVehicleSeat", "getPedOccupiedVehicleSeat" );
-    lua_classfunction ( luaVM, "getOxygenLevel", "getPedOxygenLevel" );
-    lua_classfunction ( luaVM, "getStat", "getPedStat" );
-    lua_classfunction ( luaVM, "getTarget", "getPedTarget" );
-    lua_classfunction ( luaVM, "getTargetCollision", "getPedTargetCollision" );
-    lua_classfunction ( luaVM, "getSimplestTask", "getPedSimplestTask" );
-    lua_classfunction ( luaVM, "getTask", "getPedTask" );
-    lua_classfunction ( luaVM, "getTotalAmmo", "getPedTotalAmmo" );
-    lua_classfunction ( luaVM, "getVoice", "getPedVoice" );
-    lua_classfunction ( luaVM, "getWeapon", "getPedWeapon" );
-    lua_classfunction ( luaVM, "isChocking", "isPedChoking" );
-    lua_classfunction ( luaVM, "isDoingGangDriveby", "isPedDoingGangDriveby" );
-    lua_classfunction ( luaVM, "isDoingTask", "isPedDoingTask" );
-    lua_classfunction ( luaVM, "isDucked", "isPedDucked" );
-    lua_classfunction ( luaVM, "isHeadless", "isPedHeadless" );
-    lua_classfunction ( luaVM, "isInVehicle", "isPedInVehicle" );
-    lua_classfunction ( luaVM, "isOnFire", "isPedOnFire" );
-    lua_classfunction ( luaVM, "isOnGround", "isPedOnGround" );
-    lua_classfunction ( luaVM, "isTargetingMarkerEnabled", "isPedTargetingMarkerEnabled" );
-    lua_classfunction ( luaVM, "isDead", "isPedDead" );
-    lua_classfunction ( luaVM, "setFootBloodEnabled", "setPedFootBloodEnabled" );
-    lua_classfunction ( luaVM, "getTargetEnd", "getPedTargetEnd" );
-    lua_classfunction ( luaVM, "getTargetStart", "getPedTargetStart" );
-    lua_classfunction ( luaVM, "getWeaponMuzzlePosition", "getPedWeaponMuzzlePosition" );
-    lua_classfunction ( luaVM, "getBonePosition", "getPedBonePosition" );
-    lua_classfunction ( luaVM, "getCameraRotation", "getPedCameraRotation" );
-    lua_classfunction ( luaVM, "getWeaponSlot", "getPedWeaponSlot" );
-    lua_classfunction ( luaVM, "getWalkingStyle", "getPedWalkingStyle" );
-
-    lua_classfunction ( luaVM, "setCanBeKnockedOffBike", "setPedCanBeKnockedOffBike" );
-    lua_classfunction ( luaVM, "setAnalogControlState", "setPedAnalogControlState" );
-    lua_classfunction ( luaVM, "setAnimation", "setPedAnimation" );
-    lua_classfunction ( luaVM, "setAnimationProgress", "setPedAnimationProgress" );
-    lua_classfunction ( luaVM, "setCameraRotation", "setPedCameraRotation" );
-    lua_classfunction ( luaVM, "setControlState", "setPedControlState" );
-    lua_classfunction ( luaVM, "warpIntoVehicle", "warpPedIntoVehicle" );
-    lua_classfunction ( luaVM, "setOxygenLevel", "setPedOxygenLevel" );
-    lua_classfunction ( luaVM, "setWeaponSlot", "setPedWeaponSlot" );
-    lua_classfunction ( luaVM, "setDoingGangDriveby", "setPedDoingGangDriveby" );
-    lua_classfunction ( luaVM, "setHeadless", "setPedHeadless" );
-    lua_classfunction ( luaVM, "setOnFire", "setPedOnFire" );
-    lua_classfunction ( luaVM, "setTargetingMarkerEnabled", "setPedTargetingMarkerEnabled" );
-    lua_classfunction ( luaVM, "setVoice", "setPedVoice" );
-    lua_classfunction ( luaVM, "removeFromVehicle", "removePedFromVehicle" );
-    lua_classfunction ( luaVM, "setAimTarget", "setPedAimTarget" );
-    lua_classfunction ( luaVM, "setLookAt", "setPedLookAt" );
-    lua_classfunction ( luaVM, "setWalkingStyle", "setPedWalkingStyle" );
-    lua_classfunction ( luaVM, "giveWeapon", "givePedWeapon" );
-
-    lua_classvariable ( luaVM, "vehicle", CLuaOOPDefs::SetPedOccupiedVehicle, CLuaFunctionDefs::GetPedOccupiedVehicle );
-    lua_classvariable ( luaVM, "vehicleSeat", NULL, "getPedOccupiedVehicleSeat" );
-    lua_classvariable ( luaVM, "canBeKnockedOffBike", "setPedCanBeKnockedOffBike", "canPedBeKnockedOffBike" );
-    lua_classvariable ( luaVM, "hasJetPack", NULL, "doesPedHaveJetPack" );
-    lua_classvariable ( luaVM, "armor", NULL, "getPedArmor" );
-    lua_classvariable ( luaVM, "cameraRotation", "setPedCameraRotation", "getPedCameraRotation" );
-    lua_classvariable ( luaVM, "contactElement", NULL, "getPedContactElement" );
-    lua_classvariable ( luaVM, "moveState", NULL, "getPedMoveState" );
-    lua_classvariable ( luaVM, "oxygenLevel", "setPedOxygenLevel", "getPedOxygenLevel" );
-    lua_classvariable ( luaVM, "target", NULL, "getPedTarget" );
-    lua_classvariable ( luaVM, "simplestTask", NULL, "getPedSimplestTask" );
-    lua_classvariable ( luaVM, "choking", NULL, "isPedChoking" );
-    lua_classvariable ( luaVM, "doingGangDriveby", "setPedDoingGangDriveby", "isPedDoingGangDriveby" );
-    lua_classvariable ( luaVM, "ducked", NULL, "isPedDucked" );
-    lua_classvariable ( luaVM, "headless", "setPedHeadless", "isPedHeadless" );
-    lua_classvariable ( luaVM, "inVehicle", NULL, "isPedInVehicle" );
-    lua_classvariable ( luaVM, "onFire", "setPedOnFire", "isPedOnFire" );
-    lua_classvariable ( luaVM, "onGround", NULL, "isPedOnGround" );
-    lua_classvariable ( luaVM, "dead", NULL, "isPedDead" );
-    lua_classvariable ( luaVM, "targetingMarker", "setPedTargetingMarkerEnabled", "isPedTargetingMarkerEnabled" );
-    lua_classvariable ( luaVM, "footBlood", "setPedFootBloodEnabled", NULL );
-    lua_classvariable ( luaVM, "targetCollision", NULL, "getPedTargetCollision" );
-    lua_classvariable ( luaVM, "targetEnd", NULL, "getPedTargetEnd" );
-    lua_classvariable ( luaVM, "targetStart", NULL, "getPedTargetStart" );
-    // lua_classvariable ( luaVM, "muzzlePosition", NULL, "getPedWeaponMuzzlePosition" ); // TODO: needs to return a vector3 for oop
-    lua_classvariable ( luaVM, "weaponSlot", "setPedWeaponSlot", "getPedWeaponSlot" );
-    lua_classvariable ( luaVM, "walkingStyle", "setPedWalkingStyle", "getPedWalkingStyle" );
-
-    //lua_classvariable ( luaVM, "ammoInClip", NULL, CLuaOOPDefs::GetPedAmmoInClip ); // .ammoInClip["slot"] (readonly)
-    //lua_classvariable ( luaVM, "analogControlState", CLuaOOPDefs::SetPedAnalogControlState, CLuaOOPDefs::GetPedAnalogControlState ); //TODO: .analogControlState["control"] = value
-    //lua_classvariable ( luaVM, "controlState", CLuaOOPDefs::SetPedControlState, CLuaOOPDefs::GetPedControlState ); // TODO: .controlState["control"] = value
-    //lua_classvariable ( luaVM, "stats", NULL, CLuaOOPDefs::GetPedStat ); // table (readonly)
-    //lua_classvariable ( luaVM, "doingTask", NULL, CLuaOOPDefs::IsPedDoingTask ); // table (readonly)
-    //lua_classvariable ( luaVM, "totalAmmo", NULL, CLuaDefs::GetPedTotalAmmo ); // table readonly    
-    lua_registerclass ( luaVM, "Ped", "Element" );
-}
-
-
 // TODO: integrate colour class
 void CLuaMain::AddPlayerClass ( lua_State* luaVM )
 {
@@ -1668,7 +1552,7 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
 
     AddElementClass             ( luaVM );
     AddVehicleClass             ( luaVM );
-    AddPedClass                 ( luaVM );
+    CLuaPedDefs::AddClass       ( luaVM );
     AddPlayerClass              ( luaVM );
     AddObjectClass              ( luaVM );
     AddMarkerClass              ( luaVM );

MTA10/mods/shared_logic/lua/CLuaMain.h

@@ -15,8 +15,7 @@
 
 class CLuaMain;
 
-#ifndef __CLUAMAIN_H
-#define __CLUAMAIN_H
+#pragma once
 
 #include "CLuaTimerManager.h"
 #include "CLuaVector2.h"
@@ -79,7 +78,6 @@ class CLuaMain //: public CClient
 
     void                            AddElementClass         ( lua_State* luaVM );
     void                            AddVehicleClass         ( lua_State* luaVM );
-    void                            AddPedClass             ( lua_State* luaVM );
     void                            AddPlayerClass          ( lua_State* luaVM );
     void                            AddObjectClass          ( lua_State* luaVM );
     void                            AddMarkerClass          ( lua_State* luaVM );
@@ -163,6 +161,4 @@ class CLuaMain //: public CClient
 public:
     CFastHashMap < const void*, CRefInfo >  m_CallbackTable;
     std::map < int, SString >               m_FunctionTagMap;
-};
-
-#endif
+};