[luadefs-server] Clean up RadarArea

MTA10_Server/mods/deathmatch/Makefile.am

@@ -197,7 +197,6 @@ LOGIC = \
 ./logic/lua/CLuaFunctionDefs.Event.cpp \
 ./logic/lua/CLuaFunctionDefs.Misc.cpp \
 ./logic/lua/CLuaFunctionDefs.PREG.cpp \
-./logic/lua/CLuaFunctionDefs.RadarArea.cpp \
 ./logic/lua/CLuaFunctionDefs.Server.cpp \
 ./logic/lua/CLuaFunctionDefs.UTF.cpp \
 ./logic/lua/CLuaFunctionDefs.Utility.cpp \
@@ -218,7 +217,6 @@ LOGIC = \
 ./logic/lua/LuaUtils.cpp \
 ./logic/lua/oopdefs/CLuaOOPFunctionDefs.Connection.cpp \
 ./logic/lua/oopdefs/CLuaOOPFunctionDefs.Player.cpp \
-./logic/lua/oopdefs/CLuaOOPFunctionDefs.RadarArea.cpp \
 ./logic/luadefs/CLuaACLDefs.cpp \
 ./logic/luadefs/CLuaBitDefs.cpp \
 ./logic/luadefs/CLuaBlipDefs.cpp \
@@ -235,6 +233,7 @@ LOGIC = \
 ./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 \

MTA10_Server/mods/deathmatch/StdInc.h

@@ -125,6 +125,7 @@ struct SAclRequest;
 #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"

MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj

@@ -456,6 +456,7 @@
     <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" />
@@ -472,7 +473,6 @@
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Event.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Misc.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.UTF.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Utility.cpp" />
@@ -483,7 +483,6 @@
     <ClCompile Include="logic\lua\CLuaVector4.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">
@@ -886,6 +885,7 @@
     <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" />

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.RadarArea.cpp">
-      <Filter>Source Files\logic\lua</Filter>
-    </ClCompile>
     <ClCompile Include="logic\lua\CLuaFunctionDefs.ColShape.cpp">
       <Filter>Source Files\logic\lua</Filter>
     </ClCompile>
@@ -960,9 +957,6 @@
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Misc.cpp">
       <Filter>Source Files\logic\lua</Filter>
     </ClCompile>
-    <ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.RadarArea.cpp">
-      <Filter>Source Files\logic\oopdefs</Filter>
-    </ClCompile>
     <ClCompile Include="logic\packets\CPlayerNetworkStatusPacket.cpp">
       <Filter>Source Files\logic\packets</Filter>
     </ClCompile>
@@ -993,6 +987,9 @@
     <ClCompile Include="logic\luadefs\CLuaObjectDefs.cpp">
       <Filter>Source Files\logic\luadefs</Filter>
     </ClCompile>
+    <ClCompile Include="logic\luadefs\CLuaRadarAreaDefs.cpp">
+      <Filter>Source Files\logic\luadefs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="logic\CLightsyncManager.h">
@@ -1883,6 +1880,9 @@
     <ClInclude Include="logic\luadefs\CLuaObjectDefs.h">
       <Filter>Header Files\logic\luadefs</Filter>
     </ClInclude>
+    <ClInclude Include="logic\luadefs\CLuaRadarAreaDefs.h">
+      <Filter>Header Files\logic\luadefs</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="acl.xml">

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

@@ -70,20 +70,6 @@ class CLuaFunctionDefs
     LUA_DECLARE ( AddDebugHook );
     LUA_DECLARE ( RemoveDebugHook );
 
-    // Radar area create/destroy funcs
-    LUA_DECLARE ( CreateRadarArea );
-
-    // Radar area get funcs
-    LUA_DECLARE ( GetRadarAreaSize );
-    LUA_DECLARE ( GetRadarAreaColor );
-    LUA_DECLARE ( IsRadarAreaFlashing );
-    LUA_DECLARE ( IsInsideRadarArea );
-
-    // Radar area set funcs
-    LUA_DECLARE ( SetRadarAreaSize );
-    LUA_DECLARE ( SetRadarAreaColor );
-    LUA_DECLARE ( SetRadarAreaFlashing );
-
     // Explosion funcs
     LUA_DECLARE ( CreateExplosion );
 

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

@@ -249,29 +249,6 @@ void CLuaMain::AddColShapeClass ( lua_State* luaVM )
 }
 
 
-void CLuaMain::AddRadarAreaClass ( lua_State* luaVM )
-{
-    lua_newclass ( luaVM );
-
-    lua_classfunction ( luaVM, "create", "createRadarArea" );
-    lua_classfunction ( luaVM, "isInside", "isInsideRadarArea" );
-
-    lua_classfunction ( luaVM, "isFlashing", "isRadarAreaFlashing" );
-    lua_classfunction ( luaVM, "getSize", "getRadarAreaSize" );
-    lua_classfunction ( luaVM, "getColor", "getRadarAreaColor" );
-
-    lua_classfunction ( luaVM, "setSize", "setRadarAreaSize" );
-    lua_classfunction ( luaVM, "setFlashing", "setRadarAreaFlashing" );
-    lua_classfunction ( luaVM, "setColor", "setRadarAreaColor" );
-
-    lua_classvariable ( luaVM, "flashing", "setRadarAreaFlashing", "isRadarAreaFlashing" );
-    //lua_classvariable ( luaVM, "color", "setRadarAreaColor", "getRadarAreaColor" );
-    lua_classvariable ( luaVM, "size", "setRadarAreaSize", "getRadarAreaSize", CLuaFunctionDefs::SetRadarAreaSize, CLuaOOPDefs::GetRadarAreaSize );
-
-    lua_registerclass ( luaVM, "RadarArea", "Element" );
-}
-
-
 void CLuaMain::AddConnectionClass ( lua_State* luaVM )
 {
     lua_newclass ( luaVM );
@@ -331,10 +308,10 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
     CLuaTeamDefs        ::AddClass   ( luaVM );
     CLuaWaterDefs       ::AddClass   ( luaVM );
     CLuaTimerDefs       ::AddClass   ( luaVM );
+    CLuaRadarAreaDefs   ::AddClass   ( luaVM );
     AddAccountClass             ( luaVM );
     AddBanClass                 ( luaVM );
     AddColShapeClass            ( luaVM );
-    AddRadarAreaClass           ( luaVM );
     AddConnectionClass          ( luaVM );
     AddQueryHandleClass         ( luaVM );
 }

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

@@ -130,7 +130,6 @@ class CLuaMain //: public CClient
     void                            AddAccountClass         ( lua_State* luaVM );
     void                            AddBanClass             ( lua_State* luaVM );
     void                            AddColShapeClass        ( lua_State* luaVM );
-    void                            AddRadarAreaClass       ( lua_State* luaVM );
     void                            AddConnectionClass      ( lua_State* luaVM );
     void                            AddQueryHandleClass     ( lua_State* luaVM );
 

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

@@ -187,20 +187,6 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaCFunctions::AddFunction ( "addDebugHook", CLuaFunctionDefs::AddDebugHook );
     CLuaCFunctions::AddFunction ( "removeDebugHook", CLuaFunctionDefs::RemoveDebugHook );
 
-    // Radar area create/destroy funcs
-    CLuaCFunctions::AddFunction ( "createRadarArea", CLuaFunctionDefs::CreateRadarArea );
-
-    // Radar area get funcs
-    CLuaCFunctions::AddFunction ( "getRadarAreaSize", CLuaFunctionDefs::GetRadarAreaSize );
-    CLuaCFunctions::AddFunction ( "getRadarAreaColor", CLuaFunctionDefs::GetRadarAreaColor );
-    CLuaCFunctions::AddFunction ( "isRadarAreaFlashing", CLuaFunctionDefs::IsRadarAreaFlashing );
-    CLuaCFunctions::AddFunction ( "isInsideRadarArea", CLuaFunctionDefs::IsInsideRadarArea );
-
-    // Radar area set funcs
-    CLuaCFunctions::AddFunction ( "setRadarAreaSize", CLuaFunctionDefs::SetRadarAreaSize );
-    CLuaCFunctions::AddFunction ( "setRadarAreaColor", CLuaFunctionDefs::SetRadarAreaColor );
-    CLuaCFunctions::AddFunction ( "setRadarAreaFlashing", CLuaFunctionDefs::SetRadarAreaFlashing );
-
     // Explosion create funcs
     CLuaCFunctions::AddFunction ( "createExplosion", CLuaFunctionDefs::CreateExplosion );
 
@@ -330,6 +316,7 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaTeamDefs::LoadFunctions ();
     CLuaWaterDefs::LoadFunctions ();
     CLuaTimerDefs::LoadFunctions ();
+    CLuaRadarAreaDefs::LoadFunctions ();
 
     // All-Seeing Eye Functions
     CLuaCFunctions::AddFunction ( "getGameType", CLuaFunctionDefs::GetGameType );

MTA10_Server/mods/deathmatch/logic/lua/oopdefs/CLuaOOPDefs.h

@@ -30,9 +30,6 @@ class CLuaOOPDefs : public CLuaDefs
 
     // Connection
     LUA_DECLARE ( DbQuery );
-
-    // RadarArea
-    LUA_DECLARE ( GetRadarAreaSize );
 };
 
 #endif