[luadefs-server] Clean up Blip

MTA10_Server/mods/deathmatch/Makefile.am

@@ -190,7 +190,6 @@ LOGIC = \
 ./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 \
@@ -226,6 +225,7 @@ LOGIC = \
 ./logic/lua/oopdefs/CLuaOOPFunctionDefs.RadarArea.cpp \
 ./logic/luadefs/CLuaACLDefs.cpp \
 ./logic/luadefs/CLuaBitDefs.cpp \
+./logic/luadefs/CLuaBlipDefs.cpp \
 ./logic/luadefs/CLuaCameraDefs.cpp \
 ./logic/luadefs/CLuaClassDefs.cpp \
 ./logic/luadefs/CLuaDefs.cpp \

MTA10_Server/mods/deathmatch/StdInc.h

@@ -111,11 +111,12 @@ struct SAclRequest;
 #include "packets/CVoiceEndPacket.h"
 
 // Lua function definition includes
+#include "luadefs/CLuaElementDefs.h"
 #include "luadefs/CLuaACLDefs.h"
 #include "luadefs/CLuaBitDefs.h"
+#include "luadefs/CLuaBlipDefs.h"
 #include "luadefs/CLuaCameraDefs.h"
 #include "luadefs/CLuaDefs.h"
-#include "luadefs/CLuaElementDefs.h"
 #include "luadefs/CLuaFileDefs.h"
 #include "luadefs/CLuaHTTPDefs.h"
 #include "luadefs/CLuaHandlingDefs.h"

MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj

@@ -450,6 +450,7 @@
     <ClCompile Include="CServer.cpp" />
     <ClCompile Include="..\..\sdk\MTAPlatform.cpp" />
     <ClCompile Include="logic\CPerfStat.PlayerPacketUsage.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaBlipDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaMarkerDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaMatrixDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaPedDefs.cpp" />
@@ -460,7 +461,6 @@
     <ClCompile Include="logic\luadefs\CLuaVehicleDefs.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\lua\CLuaFunctionDefs.Clothing.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.ColShape.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Crypt.cpp" />
@@ -880,6 +880,7 @@
     <ClInclude Include="Config.h" />
     <ClInclude Include="..\..\..\vendor\zip\crypt.h" />
     <ClInclude Include="CServer.h" />
+    <ClInclude Include="logic\luadefs\CLuaBlipDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaMarkerDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaMatrixDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaPedDefs.h" />

MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj.filters

@@ -936,9 +936,6 @@
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Weapon.cpp">
       <Filter>Source Files\logic\lua</Filter>
     </ClCompile>
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Blip.cpp">
-      <Filter>Source Files\logic\lua</Filter>
-    </ClCompile>
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Object.cpp">
       <Filter>Source Files\logic\lua</Filter>
     </ClCompile>
@@ -993,6 +990,9 @@
     <ClCompile Include="logic\luadefs\CLuaPedDefs.cpp">
       <Filter>Source Files\logic\luadefs</Filter>
     </ClCompile>
+    <ClCompile Include="logic\luadefs\CLuaBlipDefs.cpp">
+      <Filter>Source Files\logic\luadefs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="logic\CLightsyncManager.h">
@@ -1868,6 +1868,9 @@
     <ClInclude Include="logic\luadefs\CLuaPedDefs.h">
       <Filter>Header Files\logic\luadefs</Filter>
     </ClInclude>
+    <ClInclude Include="logic\luadefs\CLuaBlipDefs.h">
+      <Filter>Header Files\logic\luadefs</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="acl.xml">

MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.h

@@ -70,24 +70,6 @@ class CLuaFunctionDefs
     LUA_DECLARE ( AddDebugHook );
     LUA_DECLARE ( RemoveDebugHook );
 
-    // Blip create/destroy functions
-    LUA_DECLARE ( CreateBlip );
-    LUA_DECLARE ( CreateBlipAttachedTo );
-
-    // Blip get functions
-    LUA_DECLARE ( GetBlipIcon );
-    LUA_DECLARE ( GetBlipSize );
-    LUA_DECLARE ( GetBlipColor );
-    LUA_DECLARE ( GetBlipOrdering );
-    LUA_DECLARE ( GetBlipVisibleDistance );
-
-    // Blip set functions
-    LUA_DECLARE ( SetBlipIcon );
-    LUA_DECLARE ( SetBlipSize );
-    LUA_DECLARE ( SetBlipColor );
-    LUA_DECLARE ( SetBlipOrdering );
-    LUA_DECLARE ( SetBlipVisibleDistance );
-
     // Object create/destroy functions
     LUA_DECLARE ( CreateObject );
 

MTA10_Server/mods/deathmatch/logic/lua/CLuaMain.cpp

@@ -233,36 +233,6 @@ void CLuaMain::AddBanClass ( lua_State* luaVM )
 }
 
 
-void CLuaMain::AddBlipClass( lua_State* luaVM )
-{
-    lua_newclass ( luaVM );
-
-    lua_classfunction ( luaVM, "create", "createBlip" );
-    lua_classfunction ( luaVM, "createAttachedTo", "createBlipAttachedTo" );
-
-    lua_classfunction ( luaVM, "getColor", "getBlipColor" );
-    lua_classfunction ( luaVM, "getVisibleDistance", "getBlipVisibleDistance" );
-    lua_classfunction ( luaVM, "getOrdering", "getBlipOrdering" );
-    lua_classfunction ( luaVM, "getSize", "getBlipSize" );
-    lua_classfunction ( luaVM, "getIcon", "getBlipIcon" );
-
-    lua_classfunction ( luaVM, "setColor", "setBlipColor" );
-    lua_classfunction ( luaVM, "setVisibleDistance", "setBlipVisibleDistance" );
-    lua_classfunction ( luaVM, "setOrdering", "setBlipOrdering" );
-    lua_classfunction ( luaVM, "setSize", "setBlipSize" );
-    lua_classfunction ( luaVM, "setIcon", "setBlipIcon" );
-
-    lua_classvariable ( luaVM, "icon", "setBlipIcon", "getBlipIcon" );
-    lua_classvariable ( luaVM, "size", "setBlipSize", "getBlipSize" );
-    lua_classvariable ( luaVM, "ordering", "setBlipOrdering", "getBlipOrdering" );
-    lua_classvariable ( luaVM, "visibleDistance", "setBlipVisibleDistance", "getBlipVisibleDistance" );
-    //lua_classvariable ( luaVM, "color", "setBlipColor", "getBlipColor", "" ); color
-
-    lua_registerclass ( luaVM, "Blip", "Element" );
-
-}
-
-
 void CLuaMain::AddColShapeClass ( lua_State* luaVM )
 {
     lua_newclass ( luaVM );
@@ -442,9 +412,9 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
     CLuaPedDefs         ::AddClass   ( luaVM );
     CLuaPlayerDefs      ::AddClass   ( luaVM );
     CLuaResourceDefs    ::AddClass   ( luaVM );
+    CLuaBlipDefs        ::AddClass   ( luaVM );
     AddAccountClass             ( luaVM );
     AddBanClass                 ( luaVM );
-    AddBlipClass                ( luaVM );
     AddColShapeClass            ( luaVM );
     AddObjectClass              ( luaVM );
     AddRadarAreaClass           ( luaVM );

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                            AddBlipClass            ( lua_State* luaVM );
     void                            AddColShapeClass        ( lua_State* luaVM );
     void                            AddObjectClass          ( lua_State* luaVM );
     void                            AddRadarAreaClass       ( lua_State* luaVM );

MTA10_Server/mods/deathmatch/logic/lua/CLuaManager.cpp

@@ -186,24 +186,6 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaCFunctions::AddFunction ( "cancelLatentEvent", CLuaFunctionDefs::CancelLatentEvent );
     CLuaCFunctions::AddFunction ( "addDebugHook", CLuaFunctionDefs::AddDebugHook );
     CLuaCFunctions::AddFunction ( "removeDebugHook", CLuaFunctionDefs::RemoveDebugHook );
-
-    // Blip create/destroy funcs
-    CLuaCFunctions::AddFunction ( "createBlip", CLuaFunctionDefs::CreateBlip );
-    CLuaCFunctions::AddFunction ( "createBlipAttachedTo", CLuaFunctionDefs::CreateBlipAttachedTo );
-
-    // Blip get funcs
-    CLuaCFunctions::AddFunction ( "getBlipIcon", CLuaFunctionDefs::GetBlipIcon );
-    CLuaCFunctions::AddFunction ( "getBlipSize", CLuaFunctionDefs::GetBlipSize );
-    CLuaCFunctions::AddFunction ( "getBlipColor", CLuaFunctionDefs::GetBlipColor );
-    CLuaCFunctions::AddFunction ( "getBlipOrdering", CLuaFunctionDefs::GetBlipOrdering );
-    CLuaCFunctions::AddFunction ( "getBlipVisibleDistance", CLuaFunctionDefs::GetBlipVisibleDistance );
-
-    // Blip set funcs
-    CLuaCFunctions::AddFunction ( "setBlipIcon", CLuaFunctionDefs::SetBlipIcon );
-    CLuaCFunctions::AddFunction ( "setBlipSize", CLuaFunctionDefs::SetBlipSize );
-    CLuaCFunctions::AddFunction ( "setBlipColor", CLuaFunctionDefs::SetBlipColor );
-    CLuaCFunctions::AddFunction ( "setBlipOrdering", CLuaFunctionDefs::SetBlipOrdering );
-    CLuaCFunctions::AddFunction ( "setBlipVisibleDistance", CLuaFunctionDefs::SetBlipVisibleDistance );
 
     // Object create/destroy funcs
     CLuaCFunctions::AddFunction ( "createObject", CLuaFunctionDefs::CreateObject );
@@ -387,6 +369,7 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaMarkerDefs::LoadFunctions ();
     CLuaPedDefs::LoadFunctions ();
     CLuaPlayerDefs::LoadFunctions ();
+    CLuaBlipDefs::LoadFunctions ();
 
     // All-Seeing Eye Functions
     CLuaCFunctions::AddFunction ( "getGameType", CLuaFunctionDefs::GetGameType );