[luadefs-server] Clean up ColShapes

multitheftauto · Sep 12, 2015 · 57544b4 · 57544b4
1 parent c41f39a
commit 57544b4
Show file tree

Hide file tree

Showing 10 changed files with 339 additions and 324 deletions.
diff --git a/MTA10_Server/mods/deathmatch/Makefile.am b/MTA10_Server/mods/deathmatch/Makefile.am
@@ -191,7 +191,6 @@ LOGIC = \
 ./logic/lua/CLuaFunctionDefs.Account.cpp \
 ./logic/lua/CLuaFunctionDefs.Ban.cpp \
 ./logic/lua/CLuaFunctionDefs.Clothing.cpp \
-./logic/lua/CLuaFunctionDefs.ColShape.cpp \
 ./logic/lua/CLuaFunctionDefs.Crypt.cpp \
 ./logic/lua/CLuaFunctionDefs.Database.cpp \
 ./logic/lua/CLuaFunctionDefs.Event.cpp \
@@ -222,6 +221,7 @@ LOGIC = \
 ./logic/luadefs/CLuaBlipDefs.cpp \
 ./logic/luadefs/CLuaCameraDefs.cpp \
 ./logic/luadefs/CLuaClassDefs.cpp \
+./logic/luadefs/CLuaColShapeDefs.cpp \
 ./logic/luadefs/CLuaDefs.cpp \
 ./logic/luadefs/CLuaElementDefs.cpp \
 ./logic/luadefs/CLuaFileDefs.cpp \

diff --git a/MTA10_Server/mods/deathmatch/StdInc.h b/MTA10_Server/mods/deathmatch/StdInc.h
@@ -116,6 +116,7 @@ struct SAclRequest;
 #include "luadefs/CLuaBitDefs.h"
 #include "luadefs/CLuaBlipDefs.h"
 #include "luadefs/CLuaCameraDefs.h"
+#include "luadefs/CLuaColShapeDefs.h"
 #include "luadefs/CLuaDefs.h"
 #include "luadefs/CLuaFileDefs.h"
 #include "luadefs/CLuaHTTPDefs.h"

diff --git a/MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj b/MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj
@@ -451,6 +451,7 @@
     <ClCompile Include="..\..\sdk\MTAPlatform.cpp" />
     <ClCompile Include="logic\CPerfStat.PlayerPacketUsage.cpp" />
     <ClCompile Include="logic\luadefs\CLuaBlipDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaColShapeDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaMarkerDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaMatrixDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaObjectDefs.cpp" />
@@ -467,7 +468,6 @@
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Account.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Ban.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Clothing.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.ColShape.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Crypt.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Database.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Event.cpp" />
@@ -880,6 +880,7 @@
     <ClInclude Include="..\..\..\vendor\zip\crypt.h" />
     <ClInclude Include="CServer.h" />
     <ClInclude Include="logic\luadefs\CLuaBlipDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaColShapeDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaMarkerDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaMatrixDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaObjectDefs.h" />

diff --git a/MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj.filters b/MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj.filters
@@ -933,9 +933,6 @@
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Weapon.cpp">
       <Filter>Source Files\logic\lua</Filter>
     </ClCompile>
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.ColShape.cpp">
-      <Filter>Source Files\logic\lua</Filter>
-    </ClCompile>
     <ClCompile Include="logic\lua\CLuaFunctionDefs.UTF.cpp">
       <Filter>Source Files\logic\lua</Filter>
     </ClCompile>
@@ -990,6 +987,9 @@
     <ClCompile Include="logic\luadefs\CLuaRadarAreaDefs.cpp">
       <Filter>Source Files\logic\luadefs</Filter>
     </ClCompile>
+    <ClCompile Include="logic\luadefs\CLuaColShapeDefs.cpp">
+      <Filter>Source Files\logic\lua</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="logic\CLightsyncManager.h">
@@ -1883,6 +1883,9 @@
     <ClInclude Include="logic\luadefs\CLuaRadarAreaDefs.h">
       <Filter>Header Files\logic\luadefs</Filter>
     </ClInclude>
+    <ClInclude Include="logic\luadefs\CLuaColShapeDefs.h">
+      <Filter>Header Files\logic\luadefs</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="acl.xml">

diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.h b/MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.h
@@ -82,14 +82,6 @@ class CLuaFunctionDefs
     LUA_DECLARE ( GetTypeIndexFromClothes );
     LUA_DECLARE ( GetClothesTypeName );
 
-    // Shape create funcs
-    LUA_DECLARE ( CreateColCircle );
-    LUA_DECLARE ( CreateColCuboid );
-    LUA_DECLARE ( CreateColSphere );
-    LUA_DECLARE ( CreateColRectangle );
-    LUA_DECLARE ( CreateColPolygon );
-    LUA_DECLARE ( CreateColTube );
-
     // Weapon funcs
     LUA_DECLARE ( GetWeaponProperty );
     LUA_DECLARE ( GetOriginalWeaponProperty );

diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaMain.cpp b/MTA10_Server/mods/deathmatch/logic/lua/CLuaMain.cpp
@@ -233,22 +233,6 @@ void CLuaMain::AddBanClass ( lua_State* luaVM )
 }
 
 
-void CLuaMain::AddColShapeClass ( lua_State* luaVM )
-{
-    lua_newclass ( luaVM );
-
-    lua_classfunction ( luaVM, "Circle", "createColCircle" );
-    lua_classfunction ( luaVM, "Cuboid", "createColCuboid" );
-    lua_classfunction ( luaVM, "Rectangle", "createColRectangle" );
-    lua_classfunction ( luaVM, "Sphere", "createColSphere" );
-    lua_classfunction ( luaVM, "Tube", "createColTube" );
-    lua_classfunction ( luaVM, "Polygon", "createColPolygon" );
-
-    lua_classfunction ( luaVM, "getElementsWithin", "getElementsWithinColShape" );
-    lua_registerclass ( luaVM, "ColShape", "Element" );
-}
-
-
 void CLuaMain::AddConnectionClass ( lua_State* luaVM )
 {
     lua_newclass ( luaVM );
@@ -293,6 +277,7 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
     // Putting CLuaElementDefs::AddClass near
     // the bottom will cause a crash.
     CLuaElementDefs     ::AddClass   ( luaVM );
+    CLuaColShapeDefs    ::AddClass   ( luaVM );
     CLuaFileDefs        ::AddClass   ( luaVM );
     CLuaXMLDefs         ::AddClass   ( luaVM );
     CLuaPickupDefs      ::AddClass   ( luaVM );
@@ -311,7 +296,6 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
     CLuaRadarAreaDefs   ::AddClass   ( luaVM );
     AddAccountClass             ( luaVM );
     AddBanClass                 ( luaVM );
-    AddColShapeClass            ( luaVM );
     AddConnectionClass          ( luaVM );
     AddQueryHandleClass         ( luaVM );
 }

diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaMain.h b/MTA10_Server/mods/deathmatch/logic/lua/CLuaMain.h
@@ -129,7 +129,6 @@ class CLuaMain //: public CClient
 public:
     void                            AddAccountClass         ( lua_State* luaVM );
     void                            AddBanClass             ( lua_State* luaVM );
-    void                            AddColShapeClass        ( lua_State* luaVM );
     void                            AddConnectionClass      ( lua_State* luaVM );
     void                            AddQueryHandleClass     ( lua_State* luaVM );
 

diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaManager.cpp b/MTA10_Server/mods/deathmatch/logic/lua/CLuaManager.cpp
@@ -202,14 +202,6 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaCFunctions::AddFunction ( "getTypeIndexFromClothes", CLuaFunctionDefs::GetTypeIndexFromClothes );
     CLuaCFunctions::AddFunction ( "getClothesTypeName", CLuaFunctionDefs::GetClothesTypeName );
 
-    // Shape create funcs
-    CLuaCFunctions::AddFunction ( "createColCircle", CLuaFunctionDefs::CreateColCircle );
-    CLuaCFunctions::AddFunction ( "createColCuboid", CLuaFunctionDefs::CreateColCuboid );
-    CLuaCFunctions::AddFunction ( "createColSphere", CLuaFunctionDefs::CreateColSphere );
-    CLuaCFunctions::AddFunction ( "createColRectangle", CLuaFunctionDefs::CreateColRectangle );
-    CLuaCFunctions::AddFunction ( "createColPolygon", CLuaFunctionDefs::CreateColPolygon );
-    CLuaCFunctions::AddFunction ( "createColTube", CLuaFunctionDefs::CreateColTube );
-
     // Weapon funcs
     CLuaCFunctions::AddFunction ( "getWeaponNameFromID", CLuaFunctionDefs::GetWeaponNameFromID );
     CLuaCFunctions::AddFunction ( "getWeaponIDFromName", CLuaFunctionDefs::GetWeaponIDFromName );
@@ -317,6 +309,7 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaWaterDefs::LoadFunctions ();
     CLuaTimerDefs::LoadFunctions ();
     CLuaRadarAreaDefs::LoadFunctions ();
+    CLuaColShapeDefs::LoadFunctions ();
 
     // All-Seeing Eye Functions
     CLuaCFunctions::AddFunction ( "getGameType", CLuaFunctionDefs::GetGameType );