Clean up client RadarArea luadefs

(cherry picked from commit 4b04002)
multitheftauto · Jul 13, 2016 · b455787 · b455787
1 parent ef3d3c1
commit b455787
Show file tree

Hide file tree

Showing 11 changed files with 336 additions and 342 deletions.
diff --git a/MTA10/mods/deathmatch/StdInc.h b/MTA10/mods/deathmatch/StdInc.h
@@ -116,6 +116,7 @@
 #include <luadefs/CLuaPointLightDefs.h>
 #include <luadefs/CLuaPedDefs.h>
 #include <luadefs/CLuaPlayerDefs.h>
+#include <luadefs/CLuaRadarAreaDefs.h>
 #include <luadefs/CLuaVector2Defs.h>
 #include <luadefs/CLuaVector3Defs.h>
 #include <luadefs/CLuaVector4Defs.h>

diff --git a/MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj b/MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj
@@ -375,6 +375,7 @@
     <ClCompile Include="..\shared_logic\luadefs\CLuaPlayerDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaPointLightDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaPedDefs.cpp" />
+    <ClCompile Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaSearchLightDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaVector2Defs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaVector3Defs.cpp" />
@@ -384,7 +385,6 @@
     <ClCompile Include="..\shared_logic\lua\CLuaVector3.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaVector4.cpp" />
     <ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Drawing.cpp" />
-    <ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.RadarArea.cpp" />
     <ClCompile Include="..\shared_logic\CClientWebBrowser.cpp" />
     <ClCompile Include="CClient.cpp" />
     <ClCompile Include="Client.cpp" />
@@ -579,7 +579,6 @@
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Output.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Pickup.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Projectile.cpp" />
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Radar.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Resource.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Shape.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Team.cpp" />
@@ -768,6 +767,7 @@
     <ClInclude Include="..\shared_logic\luadefs\CLuaPlayerDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaPointLightDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaPedDefs.h" />
+    <ClInclude Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaSearchLightDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaVector2Defs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaVector3Defs.h" />

diff --git a/MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj.filters b/MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj.filters
@@ -602,9 +602,6 @@
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Projectile.cpp">
       <Filter>Source Files\shared_logic\lua</Filter>
     </ClCompile>
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Radar.cpp">
-      <Filter>Source Files\shared_logic\lua</Filter>
-    </ClCompile>
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Resource.cpp">
       <Filter>Source Files\shared_logic\lua</Filter>
     </ClCompile>
@@ -788,9 +785,6 @@
     <ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Drawing.cpp">
       <Filter>Source Files\shared_logic\lua\oopdefs</Filter>
     </ClCompile>
-    <ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.RadarArea.cpp">
-      <Filter>Source Files\shared_logic\lua\oopdefs</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\vendor\lua\src\lmathlib.c">
       <Filter>Source Files\utils\lualib</Filter>
     </ClCompile>
@@ -932,6 +926,9 @@
     <ClCompile Include="..\shared_logic\luadefs\CLuaElementDefs.cpp">
       <Filter>Source Files\shared_logic\luadefs</Filter>
     </ClCompile>
+    <ClCompile Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.cpp">
+      <Filter>Source Files\shared_logic\luadefs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CClient.h">
@@ -1690,5 +1687,8 @@
     <ClInclude Include="..\shared_logic\luadefs\CLuaElementDefs.h">
       <Filter>Header Files\shared_logic\luadefs</Filter>
     </ClInclude>
+    <ClInclude Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.h">
+      <Filter>Header Files\shared_logic\luadefs</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h
@@ -95,16 +95,6 @@ class CLuaFunctionDefs
     // Fire functions
     LUA_DECLARE ( CreateFire );
 
-    // Radar-area funcs
-    LUA_DECLARE ( CreateRadarArea );
-    LUA_DECLARE ( GetRadarAreaColor );
-    LUA_DECLARE ( GetRadarAreaSize );
-    LUA_DECLARE ( IsRadarAreaFlashing );
-    LUA_DECLARE ( SetRadarAreaColor );
-    LUA_DECLARE ( SetRadarAreaFlashing );
-    LUA_DECLARE ( SetRadarAreaSize );
-    LUA_DECLARE ( IsInsideRadarArea );
-
     // Pickup create/destroy funcs
     LUA_DECLARE ( CreatePickup );
 

diff --git a/MTA10/mods/shared_logic/lua/CLuaMain.cpp b/MTA10/mods/shared_logic/lua/CLuaMain.cpp
@@ -197,30 +197,6 @@ void CLuaMain::AddProjectileClass ( lua_State* luaVM )
 }
 
 
-// TODO: specials
-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", CLuaFunctionDefs::SetRadarAreaSize, CLuaOOPDefs::GetRadarAreaSize );
-
-    lua_registerclass ( luaVM, "RadarArea", "Element" );
-}
-
-
 // TODO: specials
 void CLuaMain::AddTeamClass ( lua_State* luaVM )
 {
@@ -998,7 +974,7 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
     AddPickupClass              ( luaVM );
     AddColShapeClass            ( luaVM );
     AddProjectileClass          ( luaVM );
-    AddRadarAreaClass           ( luaVM );
+
     AddTeamClass                ( luaVM );
     AddWaterClass               ( luaVM );
     CLuaAudioDefs::AddClass     ( luaVM );
@@ -1047,6 +1023,7 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
     CLuaPedDefs::AddClass ( luaVM );
     CLuaPlayerDefs::AddClass ( luaVM );
     CLuaPointLightDefs::AddClass ( luaVM );
+    CLuaRadarAreaDefs::AddClass ( luaVM );
     CLuaSearchLightDefs::AddClass ( luaVM );
     CLuaVehicleDefs::AddClass ( luaVM );
 }

diff --git a/MTA10/mods/shared_logic/lua/CLuaMain.h b/MTA10/mods/shared_logic/lua/CLuaMain.h
@@ -79,7 +79,6 @@ class CLuaMain //: public CClient
     void                            AddPickupClass          ( lua_State* luaVM );
     void                            AddColShapeClass        ( lua_State* luaVM );
     void                            AddProjectileClass      ( lua_State* luaVM );
-    void                            AddRadarAreaClass       ( lua_State* luaVM );
     void                            AddTeamClass            ( lua_State* luaVM );
     void                            AddWaterClass           ( lua_State* luaVM );
     void                            AddWeaponClass          ( lua_State* luaVM );

diff --git a/MTA10/mods/shared_logic/lua/CLuaManager.cpp b/MTA10/mods/shared_logic/lua/CLuaManager.cpp
@@ -329,16 +329,6 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaCFunctions::AddFunction ( "dxIsAspectRatioAdjustmentEnabled", CLuaFunctionDefs::dxIsAspectRatioAdjustmentEnabled );
     CLuaCFunctions::AddFunction ( "dxSetTextureEdge", CLuaFunctionDefs::dxSetTextureEdge );
 
-    // Radar-area funcs
-    CLuaCFunctions::AddFunction ( "createRadarArea", CLuaFunctionDefs::CreateRadarArea );
-    CLuaCFunctions::AddFunction ( "getRadarAreaColor", CLuaFunctionDefs::GetRadarAreaColor  );
-    CLuaCFunctions::AddFunction ( "getRadarAreaSize", CLuaFunctionDefs::GetRadarAreaSize );
-    CLuaCFunctions::AddFunction ( "isRadarAreaFlashing", CLuaFunctionDefs::IsRadarAreaFlashing );
-    CLuaCFunctions::AddFunction ( "setRadarAreaColor", CLuaFunctionDefs::SetRadarAreaColor );
-    CLuaCFunctions::AddFunction ( "setRadarAreaFlashing", CLuaFunctionDefs::SetRadarAreaFlashing );
-    CLuaCFunctions::AddFunction ( "setRadarAreaSize", CLuaFunctionDefs::SetRadarAreaSize );
-    CLuaCFunctions::AddFunction ( "isInsideRadarArea", CLuaFunctionDefs::IsInsideRadarArea );
-
     // Pickup create/destroy funcs
     CLuaCFunctions::AddFunction ( "createPickup", CLuaFunctionDefs::CreatePickup );
 
@@ -796,6 +786,7 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaPedDefs::LoadFunctions ();
     CLuaPlayerDefs::LoadFunctions ();
     CLuaPointLightDefs::LoadFunctions ();
+    CLuaRadarAreaDefs::LoadFunctions ();
     CLuaSearchLightDefs::LoadFunctions ();
     CLuaTaskDefs::LoadFunctions ();
     CLuaVehicleDefs::LoadFunctions ();

diff --git a/MTA10/mods/shared_logic/lua/oopdefs/CLuaOOPDefs.h b/MTA10/mods/shared_logic/lua/oopdefs/CLuaOOPDefs.h
@@ -41,9 +41,6 @@ class CLuaOOPDefs : public CLuaDefs
     // Drawing
     LUA_DECLARE ( DxGetFontHeight );
     LUA_DECLARE ( DxGetTextWidth );
-
-    // Radar Area
-    LUA_DECLARE ( GetRadarAreaSize );
 };
 
 #endif
diff --git a/MTA10/mods/shared_logic/lua/oopdefs/CLuaOOPFunctionDefs.RadarArea.cpp b/MTA10/mods/shared_logic/lua/oopdefs/CLuaOOPFunctionDefs.RadarArea.cpp