Skip to content

Commit b455787

Browse files
qaisjpqaisjp
committed
Clean up client RadarArea luadefs
(cherry picked from commit 4b04002)
1 parent ef3d3c1 commit b455787

File tree

11 files changed

+336
-342
lines changed

11 files changed

+336
-342
lines changed

‎MTA10/mods/deathmatch/StdInc.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
#include <luadefs/CLuaPointLightDefs.h>
117117
#include <luadefs/CLuaPedDefs.h>
118118
#include <luadefs/CLuaPlayerDefs.h>
119+
#include <luadefs/CLuaRadarAreaDefs.h>
119120
#include <luadefs/CLuaVector2Defs.h>
120121
#include <luadefs/CLuaVector3Defs.h>
121122
#include <luadefs/CLuaVector4Defs.h>

‎MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@
375375
<ClCompile Include="..\shared_logic\luadefs\CLuaPlayerDefs.cpp" />
376376
<ClCompile Include="..\shared_logic\luadefs\CLuaPointLightDefs.cpp" />
377377
<ClCompile Include="..\shared_logic\luadefs\CLuaPedDefs.cpp" />
378+
<ClCompile Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.cpp" />
378379
<ClCompile Include="..\shared_logic\luadefs\CLuaSearchLightDefs.cpp" />
379380
<ClCompile Include="..\shared_logic\luadefs\CLuaVector2Defs.cpp" />
380381
<ClCompile Include="..\shared_logic\luadefs\CLuaVector3Defs.cpp" />
@@ -384,7 +385,6 @@
384385
<ClCompile Include="..\shared_logic\lua\CLuaVector3.cpp" />
385386
<ClCompile Include="..\shared_logic\lua\CLuaVector4.cpp" />
386387
<ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Drawing.cpp" />
387-
<ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.RadarArea.cpp" />
388388
<ClCompile Include="..\shared_logic\CClientWebBrowser.cpp" />
389389
<ClCompile Include="CClient.cpp" />
390390
<ClCompile Include="Client.cpp" />
@@ -579,7 +579,6 @@
579579
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Output.cpp" />
580580
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Pickup.cpp" />
581581
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Projectile.cpp" />
582-
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Radar.cpp" />
583582
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Resource.cpp" />
584583
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Shape.cpp" />
585584
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Team.cpp" />
@@ -768,6 +767,7 @@
768767
<ClInclude Include="..\shared_logic\luadefs\CLuaPlayerDefs.h" />
769768
<ClInclude Include="..\shared_logic\luadefs\CLuaPointLightDefs.h" />
770769
<ClInclude Include="..\shared_logic\luadefs\CLuaPedDefs.h" />
770+
<ClInclude Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.h" />
771771
<ClInclude Include="..\shared_logic\luadefs\CLuaSearchLightDefs.h" />
772772
<ClInclude Include="..\shared_logic\luadefs\CLuaVector2Defs.h" />
773773
<ClInclude Include="..\shared_logic\luadefs\CLuaVector3Defs.h" />

‎MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj.filters‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -602,9 +602,6 @@
602602
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Projectile.cpp">
603603
<Filter>Source Files\shared_logic\lua</Filter>
604604
</ClCompile>
605-
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Radar.cpp">
606-
<Filter>Source Files\shared_logic\lua</Filter>
607-
</ClCompile>
608605
<ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Resource.cpp">
609606
<Filter>Source Files\shared_logic\lua</Filter>
610607
</ClCompile>
@@ -788,9 +785,6 @@
788785
<ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.Drawing.cpp">
789786
<Filter>Source Files\shared_logic\lua\oopdefs</Filter>
790787
</ClCompile>
791-
<ClCompile Include="..\shared_logic\lua\oopdefs\CLuaOOPFunctionDefs.RadarArea.cpp">
792-
<Filter>Source Files\shared_logic\lua\oopdefs</Filter>
793-
</ClCompile>
794788
<ClCompile Include="..\..\..\vendor\lua\src\lmathlib.c">
795789
<Filter>Source Files\utils\lualib</Filter>
796790
</ClCompile>
@@ -932,6 +926,9 @@
932926
<ClCompile Include="..\shared_logic\luadefs\CLuaElementDefs.cpp">
933927
<Filter>Source Files\shared_logic\luadefs</Filter>
934928
</ClCompile>
929+
<ClCompile Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.cpp">
930+
<Filter>Source Files\shared_logic\luadefs</Filter>
931+
</ClCompile>
935932
</ItemGroup>
936933
<ItemGroup>
937934
<ClInclude Include="CClient.h">
@@ -1690,5 +1687,8 @@
16901687
<ClInclude Include="..\shared_logic\luadefs\CLuaElementDefs.h">
16911688
<Filter>Header Files\shared_logic\luadefs</Filter>
16921689
</ClInclude>
1690+
<ClInclude Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.h">
1691+
<Filter>Header Files\shared_logic\luadefs</Filter>
1692+
</ClInclude>
16931693
</ItemGroup>
16941694
</Project>

‎MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,6 @@ class CLuaFunctionDefs
9595
// Fire functions
9696
LUA_DECLARE ( CreateFire );
9797

98-
// Radar-area funcs
99-
LUA_DECLARE ( CreateRadarArea );
100-
LUA_DECLARE ( GetRadarAreaColor );
101-
LUA_DECLARE ( GetRadarAreaSize );
102-
LUA_DECLARE ( IsRadarAreaFlashing );
103-
LUA_DECLARE ( SetRadarAreaColor );
104-
LUA_DECLARE ( SetRadarAreaFlashing );
105-
LUA_DECLARE ( SetRadarAreaSize );
106-
LUA_DECLARE ( IsInsideRadarArea );
107-
10898
// Pickup create/destroy funcs
10999
LUA_DECLARE ( CreatePickup );
110100

‎MTA10/mods/shared_logic/lua/CLuaMain.cpp‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -197,30 +197,6 @@ void CLuaMain::AddProjectileClass ( lua_State* luaVM )
197197
}
198198

199199

200-
// TODO: specials
201-
void CLuaMain::AddRadarAreaClass ( lua_State* luaVM )
202-
{
203-
lua_newclass ( luaVM );
204-
205-
lua_classfunction ( luaVM, "create", "createRadarArea" );
206-
lua_classfunction ( luaVM, "isInside", "isInsideRadarArea" );
207-
208-
lua_classfunction ( luaVM, "isFlashing", "isRadarAreaFlashing" );
209-
lua_classfunction ( luaVM, "getSize", "getRadarAreaSize" );
210-
lua_classfunction ( luaVM, "getColor", "getRadarAreaColor" );
211-
212-
lua_classfunction ( luaVM, "setSize", "setRadarAreaSize" );
213-
lua_classfunction ( luaVM, "setFlashing", "setRadarAreaFlashing" );
214-
lua_classfunction ( luaVM, "setColor", "setRadarAreaColor" );
215-
216-
lua_classvariable ( luaVM, "flashing", "setRadarAreaFlashing", "isRadarAreaFlashing" );
217-
//lua_classvariable ( luaVM, "color", "setRadarAreaColor", "getRadarAreaColor" );
218-
lua_classvariable ( luaVM, "size", CLuaFunctionDefs::SetRadarAreaSize, CLuaOOPDefs::GetRadarAreaSize );
219-
220-
lua_registerclass ( luaVM, "RadarArea", "Element" );
221-
}
222-
223-
224200
// TODO: specials
225201
void CLuaMain::AddTeamClass ( lua_State* luaVM )
226202
{
@@ -998,7 +974,7 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
998974
AddPickupClass ( luaVM );
999975
AddColShapeClass ( luaVM );
1000976
AddProjectileClass ( luaVM );
1001-
AddRadarAreaClass ( luaVM );
977+
1002978
AddTeamClass ( luaVM );
1003979
AddWaterClass ( luaVM );
1004980
CLuaAudioDefs::AddClass ( luaVM );
@@ -1047,6 +1023,7 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
10471023
CLuaPedDefs::AddClass ( luaVM );
10481024
CLuaPlayerDefs::AddClass ( luaVM );
10491025
CLuaPointLightDefs::AddClass ( luaVM );
1026+
CLuaRadarAreaDefs::AddClass ( luaVM );
10501027
CLuaSearchLightDefs::AddClass ( luaVM );
10511028
CLuaVehicleDefs::AddClass ( luaVM );
10521029
}

‎MTA10/mods/shared_logic/lua/CLuaMain.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ class CLuaMain //: public CClient
7979
void AddPickupClass ( lua_State* luaVM );
8080
void AddColShapeClass ( lua_State* luaVM );
8181
void AddProjectileClass ( lua_State* luaVM );
82-
void AddRadarAreaClass ( lua_State* luaVM );
8382
void AddTeamClass ( lua_State* luaVM );
8483
void AddWaterClass ( lua_State* luaVM );
8584
void AddWeaponClass ( lua_State* luaVM );

‎MTA10/mods/shared_logic/lua/CLuaManager.cpp‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -329,16 +329,6 @@ void CLuaManager::LoadCFunctions ( void )
329329
CLuaCFunctions::AddFunction ( "dxIsAspectRatioAdjustmentEnabled", CLuaFunctionDefs::dxIsAspectRatioAdjustmentEnabled );
330330
CLuaCFunctions::AddFunction ( "dxSetTextureEdge", CLuaFunctionDefs::dxSetTextureEdge );
331331

332-
// Radar-area funcs
333-
CLuaCFunctions::AddFunction ( "createRadarArea", CLuaFunctionDefs::CreateRadarArea );
334-
CLuaCFunctions::AddFunction ( "getRadarAreaColor", CLuaFunctionDefs::GetRadarAreaColor );
335-
CLuaCFunctions::AddFunction ( "getRadarAreaSize", CLuaFunctionDefs::GetRadarAreaSize );
336-
CLuaCFunctions::AddFunction ( "isRadarAreaFlashing", CLuaFunctionDefs::IsRadarAreaFlashing );
337-
CLuaCFunctions::AddFunction ( "setRadarAreaColor", CLuaFunctionDefs::SetRadarAreaColor );
338-
CLuaCFunctions::AddFunction ( "setRadarAreaFlashing", CLuaFunctionDefs::SetRadarAreaFlashing );
339-
CLuaCFunctions::AddFunction ( "setRadarAreaSize", CLuaFunctionDefs::SetRadarAreaSize );
340-
CLuaCFunctions::AddFunction ( "isInsideRadarArea", CLuaFunctionDefs::IsInsideRadarArea );
341-
342332
// Pickup create/destroy funcs
343333
CLuaCFunctions::AddFunction ( "createPickup", CLuaFunctionDefs::CreatePickup );
344334

@@ -796,6 +786,7 @@ void CLuaManager::LoadCFunctions ( void )
796786
CLuaPedDefs::LoadFunctions ();
797787
CLuaPlayerDefs::LoadFunctions ();
798788
CLuaPointLightDefs::LoadFunctions ();
789+
CLuaRadarAreaDefs::LoadFunctions ();
799790
CLuaSearchLightDefs::LoadFunctions ();
800791
CLuaTaskDefs::LoadFunctions ();
801792
CLuaVehicleDefs::LoadFunctions ();

‎MTA10/mods/shared_logic/lua/oopdefs/CLuaOOPDefs.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ class CLuaOOPDefs : public CLuaDefs
4141
// Drawing
4242
LUA_DECLARE ( DxGetFontHeight );
4343
LUA_DECLARE ( DxGetTextWidth );
44-
45-
// Radar Area
46-
LUA_DECLARE ( GetRadarAreaSize );
4744
};
4845

4946
#endif

‎MTA10/mods/shared_logic/lua/oopdefs/CLuaOOPFunctionDefs.RadarArea.cpp‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)