[luadefs-server] Move Element OOPDefs to Defs

multitheftauto · Sep 9, 2015 · 8cad888 · 8cad888
1 parent 35c713c
commit 8cad888
Show file tree

Hide file tree

Showing 8 changed files with 230 additions and 263 deletions.
diff --git a/MTA10_Server/mods/deathmatch/Makefile.am b/MTA10_Server/mods/deathmatch/Makefile.am
@@ -227,7 +227,6 @@ LOGIC = \
 ./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 \

diff --git a/MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj b/MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj
@@ -483,7 +483,6 @@
     <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" />

diff --git a/MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj.filters b/MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj.filters
@@ -888,9 +888,6 @@
     <ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Camera.cpp">
       <Filter>Source Files\logic\oopdefs</Filter>
     </ClCompile>
-    <ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Element.cpp">
-      <Filter>Source Files\logic\oopdefs</Filter>
-    </ClCompile>
     <ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Ped.cpp">
       <Filter>Source Files\logic\oopdefs</Filter>
     </ClCompile>

diff --git a/MTA10_Server/mods/deathmatch/logic/lua/oopdefs/CLuaOOPDefs.h b/MTA10_Server/mods/deathmatch/logic/lua/oopdefs/CLuaOOPDefs.h
@@ -19,8 +19,6 @@ class CLuaFunctionDefs;
 
 class CRegisteredCommands;
 
-#define LUA_DECLARE(x) static int x ( lua_State * luaVM );
-
 class CLuaOOPDefs : public CLuaDefs
 {
 public:
@@ -30,13 +28,6 @@ class CLuaOOPDefs : public CLuaDefs
     // Player
     LUA_DECLARE ( OutputChat );
 
-    // Element
-    LUA_DECLARE ( GetElementMatrix );
-    LUA_DECLARE ( GetElementPosition );
-    LUA_DECLARE ( GetElementRotation );
-    LUA_DECLARE ( SetElementRotation );
-    LUA_DECLARE ( GetElementVelocity );
-
     // Camera
     LUA_DECLARE ( GetCameraMatrix );
     LUA_DECLARE ( GetCameraPosition );

diff --git a/MTA10_Server/mods/deathmatch/logic/lua/oopdefs/CLuaOOPFunctionDefs.Element.cpp b/MTA10_Server/mods/deathmatch/logic/lua/oopdefs/CLuaOOPFunctionDefs.Element.cpp
diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaDefs.h b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaDefs.h
@@ -54,7 +54,8 @@
 #define SCRIPT_VERIFY_ACCOUNT(account) (m_pAccountManager->Exists(account))
 #define SCRIPT_VERIFY_COLSHAPE(colshape) (m_pColManager->Exists(colshape))
 #define SCRIPT_VERIFY_RESOURCE(resource) (m_pResourceManager->Exists(resource))
-
+#define LUA_DECLARE(x) static int x ( lua_State * luaVM ); 
+#define LUA_DECLARE_OOP(x) static int x ( lua_State * luaVM ); static int OOP_##x ( lua_State * luaVM ); 
 
 class CLuaDefs
 {