Clean up client Pickup/Projectile/Shape/Weapon/Water luadefs

multitheftauto · Jul 30, 2016 · 1358890 · 1358890
1 parent cd41194
commit 1358890
Show file tree

Hide file tree

Showing 18 changed files with 2,098 additions and 2,011 deletions.
diff --git a/MTA10/mods/deathmatch/StdInc.h b/MTA10/mods/deathmatch/StdInc.h
@@ -111,25 +111,30 @@
 #include <luadefs/CLuaBrowserDefs.h>
 #include <luadefs/CLuaClassDefs.h>
 #include <luadefs/CLuaCameraDefs.h>
+#include <luadefs/CLuaColShapeDefs.h>
 #include <luadefs/CLuaDrawingDefs.h>
 #include <luadefs/CLuaElementDefs.h>
+#include <luadefs/CLuaFileDefs.h>
+#include <luadefs/CLuaFxDefs.h>
 #include <luadefs/CLuaMarkerDefs.h>
+#include <luadefs/CLuaMatrixDefs.h>
 #include <luadefs/CLuaObjectDefs.h>
 #include <luadefs/CLuaPointLightDefs.h>
 #include <luadefs/CLuaPedDefs.h>
+#include <luadefs/CLuaPickupDefs.h>
 #include <luadefs/CLuaPlayerDefs.h>
+#include <luadefs/CLuaProjectileDefs.h>
 #include <luadefs/CLuaRadarAreaDefs.h>
 #include <luadefs/CLuaResourceDefs.h>
+#include <luadefs/CLuaSearchLightDefs.h>
+#include <luadefs/CLuaTaskDefs.h>
+#include <luadefs/CLuaTeamDefs.h>
+#include <luadefs/CLuaWaterDefs.h>
 #include <luadefs/CLuaVector2Defs.h>
 #include <luadefs/CLuaVector3Defs.h>
 #include <luadefs/CLuaVector4Defs.h>
 #include <luadefs/CLuaVehicleDefs.h>
-#include <luadefs/CLuaMatrixDefs.h>
-#include <luadefs/CLuaSearchLightDefs.h>
-#include <luadefs/CLuaTaskDefs.h>
-#include <luadefs/CLuaTeamDefs.h>
-#include <luadefs/CLuaFxDefs.h>
-#include <luadefs/CLuaFileDefs.h>
+#include <luadefs/CLuaWeaponDefs.h>
 #include <CRemoteCalls.h>
 
 // Shared includes

diff --git a/MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj b/MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj
@@ -370,13 +370,16 @@
     <ClCompile Include="..\shared_logic\luadefs\CLuaBlipDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaBrowserDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaCameraDefs.cpp" />
+    <ClCompile Include="..\shared_logic\luadefs\CLuaColShapeDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaDrawingDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaElementDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaMarkerDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaObjectDefs.cpp" />
+    <ClCompile Include="..\shared_logic\luadefs\CLuaPickupDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaPlayerDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaPointLightDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaPedDefs.cpp" />
+    <ClCompile Include="..\shared_logic\luadefs\CLuaProjectileDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaResourceDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaSearchLightDefs.cpp" />
@@ -385,6 +388,8 @@
     <ClCompile Include="..\shared_logic\luadefs\CLuaVector3Defs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaVector4Defs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaVehicleDefs.cpp" />
+    <ClCompile Include="..\shared_logic\luadefs\CLuaWaterDefs.cpp" />
+    <ClCompile Include="..\shared_logic\luadefs\CLuaWeaponDefs.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaVector2.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaVector3.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaVector4.cpp" />
@@ -578,12 +583,8 @@
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.GUI.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Input.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Output.cpp" />
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Pickup.cpp" />
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Projectile.cpp" />
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Shape.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Util.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Voice.cpp" />
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Weapon.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.World.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.XML.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionParseHelpers.cpp" />
@@ -760,13 +761,16 @@
     <ClInclude Include="..\shared_logic\luadefs\CLuaBlipDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaBrowserDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaCameraDefs.h" />
+    <ClInclude Include="..\shared_logic\luadefs\CLuaColShapeDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaDrawingDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaElementDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaMarkerDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaObjectDefs.h" />
+    <ClInclude Include="..\shared_logic\luadefs\CLuaPickupDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaPlayerDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaPointLightDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaPedDefs.h" />
+    <ClInclude Include="..\shared_logic\luadefs\CLuaProjectileDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaResourceDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaSearchLightDefs.h" />
@@ -775,6 +779,8 @@
     <ClInclude Include="..\shared_logic\luadefs\CLuaVector3Defs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaVector4Defs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaVehicleDefs.h" />
+    <ClInclude Include="..\shared_logic\luadefs\CLuaWaterDefs.h" />
+    <ClInclude Include="..\shared_logic\luadefs\CLuaWeaponDefs.h" />
     <ClInclude Include="..\shared_logic\lua\CLuaVector2.h" />
     <ClInclude Include="..\shared_logic\lua\CLuaVector3.h" />
     <ClInclude Include="..\shared_logic\lua\CLuaVector4.h" />

diff --git a/MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj.filters b/MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj.filters
@@ -590,24 +590,12 @@
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Output.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>
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Projectile.cpp">
-      <Filter>Source Files\shared_logic\lua</Filter>
-    </ClCompile>
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Shape.cpp">
-      <Filter>Source Files\shared_logic\lua</Filter>
-    </ClCompile>
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Util.cpp">
       <Filter>Source Files\shared_logic\lua</Filter>
     </ClCompile>
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Voice.cpp">
       <Filter>Source Files\shared_logic\lua</Filter>
     </ClCompile>
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Weapon.cpp">
-      <Filter>Source Files\shared_logic\lua</Filter>
-    </ClCompile>
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.World.cpp">
       <Filter>Source Files\shared_logic\lua</Filter>
     </ClCompile>
@@ -923,6 +911,21 @@
     <ClCompile Include="..\shared_logic\luadefs\CLuaDrawingDefs.cpp">
       <Filter>Source Files\shared_logic\luadefs</Filter>
     </ClCompile>
+    <ClCompile Include="..\shared_logic\luadefs\CLuaColShapeDefs.cpp">
+      <Filter>Source Files\shared_logic\luadefs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\shared_logic\luadefs\CLuaPickupDefs.cpp">
+      <Filter>Source Files\shared_logic\luadefs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\shared_logic\luadefs\CLuaProjectileDefs.cpp">
+      <Filter>Source Files\shared_logic\luadefs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\shared_logic\luadefs\CLuaWeaponDefs.cpp">
+      <Filter>Source Files\shared_logic\luadefs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\shared_logic\luadefs\CLuaWaterDefs.cpp">
+      <Filter>Source Files\shared_logic\luadefs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CClient.h">
@@ -1696,6 +1699,21 @@
     <ClInclude Include="..\shared_logic\luadefs\CLuaDrawingDefs.h">
       <Filter>Header Files\shared_logic\luadefs</Filter>
     </ClInclude>
+    <ClInclude Include="..\shared_logic\luadefs\CLuaColShapeDefs.h">
+      <Filter>Header Files\shared_logic\luadefs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\shared_logic\luadefs\CLuaPickupDefs.h">
+      <Filter>Header Files\shared_logic\luadefs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\shared_logic\luadefs\CLuaProjectileDefs.h">
+      <Filter>Header Files\shared_logic\luadefs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\shared_logic\luadefs\CLuaWeaponDefs.h">
+      <Filter>Header Files\shared_logic\luadefs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\shared_logic\luadefs\CLuaWaterDefs.h">
+      <Filter>Header Files\shared_logic\luadefs</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Shared\mods\deathmatch\logic\luascripts\coroutine_debug.lua">