Merge qaisjp's commits from the 9th-13th September

All the commits from: fa46e04 to 177918f
multitheftauto · Dec 9, 2015 · e545d84 · e545d84
1 parent 8d2828a
commit e545d84
Show file tree

Hide file tree

Showing 83 changed files with 14,311 additions and 11,650 deletions.
diff --git a/MTA10_Server/mods/deathmatch/CLuaAccountDefs.cpp b/MTA10_Server/mods/deathmatch/CLuaAccountDefs.cpp
@@ -0,0 +1,28 @@
+/*****************************************************************************
+*
+*  PROJECT:     Multi Theft Auto v1.x
+*  LICENSE:     See LICENSE in the top level directory
+*  FILE:        mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp
+*  PURPOSE:     Lua function definitions class
+*
+*  Multi Theft Auto is available from http://www.multitheftauto.com/
+*
+*****************************************************************************/
+
+#include "StdInc.h"
+
+void CLuaAccountDefs::LoadFunctions ()
+{
+    // Shape create funcs
+    CLuaCFunctions::AddFunction ( "createColCircle", CreateColCircle );
+    CLuaCFunctions::AddFunction ( "createColCuboid", CreateColCuboid );
+    CLuaCFunctions::AddFunction ( "createColSphere", CreateColSphere );
+    CLuaCFunctions::AddFunction ( "createColRectangle", CreateColRectangle );
+    CLuaCFunctions::AddFunction ( "createColPolygon", CreateColPolygon );
+    CLuaCFunctions::AddFunction ( "createColTube", CreateColTube );
+}
+
+void CLuaAccountDefs::AddClass ( lua_State* luaVM )
+{
+
+}
diff --git a/MTA10_Server/mods/deathmatch/CLuaAccountDefs.h b/MTA10_Server/mods/deathmatch/CLuaAccountDefs.h
@@ -0,0 +1,38 @@
+/*****************************************************************************
+*
+*  PROJECT:     Multi Theft Auto v1.x
+*  LICENSE:     See LICENSE in the top level directory
+*  FILE:        mods/deathmatch/logic/luadefs/CLuaAccountDefs.h
+*  PURPOSE:     Lua function definitions class
+*
+*  Multi Theft Auto is available from http://www.multitheftauto.com/
+*
+*****************************************************************************/
+
+#pragma once
+#include "CLuaDefs.h"
+
+class CLuaAccountDefs : public CLuaDefs
+{
+public:
+    static void     LoadFunctions ( void );
+    static void     AddClass ( lua_State* luaVM );
+
+    // Account get funcs
+    LUA_DECLARE ( GetAccount );
+    LUA_DECLARE ( GetAccounts );
+    LUA_DECLARE ( GetAccountName );
+    LUA_DECLARE ( GetAccountPlayer );
+    LUA_DECLARE ( IsGuestAccount );
+    LUA_DECLARE ( GetAccountData );
+    LUA_DECLARE ( GetAllAccountData );
+    LUA_DECLARE ( GetAccountSerial );
+    LUA_DECLARE ( GetAccountsBySerial );
+
+    // Account set funcs
+    LUA_DECLARE ( AddAccount );
+    LUA_DECLARE ( RemoveAccount );
+    LUA_DECLARE ( SetAccountPassword );
+    LUA_DECLARE ( SetAccountData );
+    LUA_DECLARE ( CopyAccountData );
+};
diff --git a/MTA10_Server/mods/deathmatch/Makefile.am b/MTA10_Server/mods/deathmatch/Makefile.am
@@ -188,28 +188,14 @@ LOGIC = \
 ./logic/lua/CLuaArguments.cpp \
 ./logic/lua/CLuaCFunctions.cpp \
 ./logic/lua/CLuaFunctionDefs.cpp \
-./logic/lua/CLuaFunctionDefs.Account.cpp \
-./logic/lua/CLuaFunctionDefs.Ban.cpp \
-./logic/lua/CLuaFunctionDefs.Blip.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 \
-./logic/lua/CLuaFunctionDefs.Marker.cpp \
 ./logic/lua/CLuaFunctionDefs.Misc.cpp \
-./logic/lua/CLuaFunctionDefs.Object.cpp \
-./logic/lua/CLuaFunctionDefs.Ped.cpp \
-./logic/lua/CLuaFunctionDefs.Player.cpp \
 ./logic/lua/CLuaFunctionDefs.PREG.cpp \
-./logic/lua/CLuaFunctionDefs.RadarArea.cpp \
 ./logic/lua/CLuaFunctionDefs.Server.cpp \
-./logic/lua/CLuaFunctionDefs.Team.cpp \
-./logic/lua/CLuaFunctionDefs.Timer.cpp \
 ./logic/lua/CLuaFunctionDefs.UTF.cpp \
 ./logic/lua/CLuaFunctionDefs.Utility.cpp \
-./logic/lua/CLuaFunctionDefs.Vehicle.cpp \
-./logic/lua/CLuaFunctionDefs.Water.cpp \
 ./logic/lua/CLuaFunctionDefs.Weapon.cpp \
 ./logic/lua/CLuaFunctionParseHelpers.cpp \
 ./logic/lua/CLuaFunctionRef.cpp \
@@ -225,31 +211,37 @@ LOGIC = \
 ./logic/lua/CLuaVector4.cpp \
 ./logic/lua/LuaCommon.cpp \
 ./logic/lua/LuaUtils.cpp \
-./logic/lua/oopdefs/CLuaOOPFunctionDefs.ACL.cpp \
-./logic/lua/oopdefs/CLuaOOPFunctionDefs.Camera.cpp \
-./logic/lua/oopdefs/CLuaOOPFunctionDefs.Connection.cpp \
-./logic/lua/oopdefs/CLuaOOPFunctionDefs.Element.cpp \
-./logic/lua/oopdefs/CLuaOOPFunctionDefs.Marker.cpp \
-./logic/lua/oopdefs/CLuaOOPFunctionDefs.Ped.cpp \
-./logic/lua/oopdefs/CLuaOOPFunctionDefs.Player.cpp \
-./logic/lua/oopdefs/CLuaOOPFunctionDefs.RadarArea.cpp \
+./logic/luadefs/CLuaAccountDefs.cpp \
 ./logic/luadefs/CLuaACLDefs.cpp \
+./logic/luadefs/CLuaBanDefs.cpp \
 ./logic/luadefs/CLuaBitDefs.cpp \
+./logic/luadefs/CLuaBlipDefs.cpp \
 ./logic/luadefs/CLuaCameraDefs.cpp \
 ./logic/luadefs/CLuaClassDefs.cpp \
+./logic/luadefs/CLuaColShapeDefs.cpp \
+./logic/luadefs/CLuaDatabaseDefs.cpp \
 ./logic/luadefs/CLuaDefs.cpp \
 ./logic/luadefs/CLuaElementDefs.cpp \
 ./logic/luadefs/CLuaFileDefs.cpp \
 ./logic/luadefs/CLuaHandlingDefs.cpp \
 ./logic/luadefs/CLuaHTTPDefs.cpp \
 ./logic/luadefs/CLuaMatrixDefs.cpp \
+./logic/luadefs/CLuaMarkerDefs.cpp \
+./logic/luadefs/CLuaObjectDefs.cpp \
+./logic/luadefs/CLuaPedDefs.cpp \
 ./logic/luadefs/CLuaPickupDefs.cpp \
+./logic/luadefs/CLuaPlayerDefs.cpp \
+./logic/luadefs/CLuaRadarAreaDefs.cpp \
 ./logic/luadefs/CLuaResourceDefs.cpp \
+./logic/luadefs/CLuaTeamDefs.cpp \
 ./logic/luadefs/CLuaTextDefs.cpp \
+./logic/luadefs/CLuaTimerDefs.cpp \
 ./logic/luadefs/CLuaVector2Defs.cpp \
 ./logic/luadefs/CLuaVector3Defs.cpp \
 ./logic/luadefs/CLuaVector4Defs.cpp \
+./logic/luadefs/CLuaVehicleDefs.cpp \
 ./logic/luadefs/CLuaVoiceDefs.cpp \
+./logic/luadefs/CLuaWaterDefs.cpp \
 ./logic/luadefs/CLuaWorldDefs.cpp \
 ./logic/luadefs/CLuaXMLDefs.cpp \
 ./logic/packets/CCameraSyncPacket.cpp \

diff --git a/MTA10_Server/mods/deathmatch/StdInc.h b/MTA10_Server/mods/deathmatch/StdInc.h
@@ -111,26 +111,39 @@ struct SAclRequest;
 #include "packets/CVoiceEndPacket.h"
 
 // Lua function definition includes
+#include "luadefs/CLuaElementDefs.h"
+#include "luadefs/CLuaAccountDefs.h"
 #include "luadefs/CLuaACLDefs.h"
+#include "luadefs/CLuaBanDefs.h"
 #include "luadefs/CLuaBitDefs.h"
+#include "luadefs/CLuaBlipDefs.h"
 #include "luadefs/CLuaCameraDefs.h"
+#include "luadefs/CLuaClassDefs.h"
+#include "luadefs/CLuaColShapeDefs.h"
+#include "luadefs/CLuaDatabaseDefs.h"
 #include "luadefs/CLuaDefs.h"
-#include "luadefs/CLuaElementDefs.h"
 #include "luadefs/CLuaFileDefs.h"
 #include "luadefs/CLuaHTTPDefs.h"
 #include "luadefs/CLuaHandlingDefs.h"
+#include "luadefs/CLuaMarkerDefs.h"
+#include "luadefs/CLuaMatrixDefs.h"
+#include "luadefs/CLuaObjectDefs.h"
+#include "luadefs/CLuaPedDefs.h"
 #include "luadefs/CLuaPickupDefs.h"
+#include "luadefs/CLuaPlayerDefs.h"
+#include "luadefs/CLuaRadarAreaDefs.h"
 #include "luadefs/CLuaResourceDefs.h"
+#include "luadefs/CLuaTeamDefs.h"
 #include "luadefs/CLuaTextDefs.h"
-#include "luadefs/CLuaWorldDefs.h"
-#include "luadefs/CLuaVoiceDefs.h"
-#include "luadefs/CLuaXMLDefs.h"
-#include "luadefs/CLuaClassDefs.h"
+#include "luadefs/CLuaTimerDefs.h"
 #include "luadefs/CLuaVector2Defs.h"
 #include "luadefs/CLuaVector3Defs.h"
 #include "luadefs/CLuaVector4Defs.h"
-#include "luadefs/CLuaMatrixDefs.h"
-#include "lua/oopdefs/CLuaOOPDefs.h"
+#include "luadefs/CLuaVehicleDefs.h"
+#include "luadefs/CLuaVoiceDefs.h"
+#include "luadefs/CLuaWaterDefs.h"
+#include "luadefs/CLuaWorldDefs.h"
+#include "luadefs/CLuaXMLDefs.h"
 
 // Lua includes
 #include "lua/LuaCommon.h"

diff --git a/MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj b/MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj
@@ -450,45 +450,37 @@
     <ClCompile Include="CServer.cpp" />
     <ClCompile Include="..\..\sdk\MTAPlatform.cpp" />
     <ClCompile Include="logic\CPerfStat.PlayerPacketUsage.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaAccountDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaBanDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaBlipDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaColShapeDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaDatabaseDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaMarkerDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaMatrixDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaObjectDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaPedDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaPlayerDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaRadarAreaDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaTeamDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaTimerDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaVector2Defs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaVector3Defs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaVector4Defs.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Account.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Ban.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Blip.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaVehicleDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaWaterDefs.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" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Marker.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Misc.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Object.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Ped.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Player.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.PREG.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.RadarArea.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Server.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Team.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Timer.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.UTF.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Utility.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Vehicle.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Water.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Weapon.cpp" />
     <ClCompile Include="logic\lua\CLuaMatrix.cpp" />
     <ClCompile Include="logic\lua\CLuaVector2.cpp" />
     <ClCompile Include="logic\lua\CLuaVector3.cpp" />
     <ClCompile Include="logic\lua\CLuaVector4.cpp" />
-    <ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.ACL.cpp" />
-    <ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Camera.cpp" />
-    <ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Element.cpp" />
-    <ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Marker.cpp" />
-    <ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Ped.cpp" />
-    <ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Player.cpp" />
-    <ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Connection.cpp" />
-    <ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.RadarArea.cpp" />
     <ClCompile Include="logic\packets\CPlayerNetworkStatusPacket.cpp" />
     <ClCompile Include="Server.cpp" />
     <ClCompile Include="StdInc.cpp">
@@ -885,14 +877,27 @@
     <ClInclude Include="Config.h" />
     <ClInclude Include="..\..\..\vendor\zip\crypt.h" />
     <ClInclude Include="CServer.h" />
+    <ClInclude Include="logic\luadefs\CLuaAccountDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaBanDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaBlipDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaColShapeDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaDatabaseDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaMarkerDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaMatrixDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaObjectDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaPedDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaPlayerDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaRadarAreaDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaTeamDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaTimerDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaVector2Defs.h" />
     <ClInclude Include="logic\luadefs\CLuaVector3Defs.h" />
     <ClInclude Include="logic\luadefs\CLuaVector4Defs.h" />
+    <ClInclude Include="logic\luadefs\CLuaVehicleDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaWaterDefs.h" />
     <ClInclude Include="logic\lua\CLuaVector2.h" />
     <ClInclude Include="logic\lua\CLuaVector3.h" />
     <ClInclude Include="logic\lua\CLuaVector4.h" />
-    <ClInclude Include="logic\lua\oopdefs\CLuaOOPDefs.h" />
     <ClInclude Include="logic\packets\CPlayerNetworkStatusPacket.h" />
     <ClInclude Include="utils\CZipMaker.h" />
     <ClInclude Include="..\EXECryptor\EXECryptor.h" />