Skip to content

Commit 71cd272

Browse files
qaisjpqaisjp
committed
[luadefs-server] Clean up Marker
1 parent ea44011 commit 71cd272

File tree

13 files changed

+463
-469
lines changed

13 files changed

+463
-469
lines changed

‎MTA10_Server/mods/deathmatch/Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ LOGIC = \
196196
./logic/lua/CLuaFunctionDefs.Crypt.cpp \
197197
./logic/lua/CLuaFunctionDefs.Database.cpp \
198198
./logic/lua/CLuaFunctionDefs.Event.cpp \
199-
./logic/lua/CLuaFunctionDefs.Marker.cpp \
200199
./logic/lua/CLuaFunctionDefs.Misc.cpp \
201200
./logic/lua/CLuaFunctionDefs.Object.cpp \
202201
./logic/lua/CLuaFunctionDefs.Ped.cpp \
@@ -225,7 +224,6 @@ LOGIC = \
225224
./logic/lua/LuaCommon.cpp \
226225
./logic/lua/LuaUtils.cpp \
227226
./logic/lua/oopdefs/CLuaOOPFunctionDefs.Connection.cpp \
228-
./logic/lua/oopdefs/CLuaOOPFunctionDefs.Marker.cpp \
229227
./logic/lua/oopdefs/CLuaOOPFunctionDefs.Ped.cpp \
230228
./logic/lua/oopdefs/CLuaOOPFunctionDefs.Player.cpp \
231229
./logic/lua/oopdefs/CLuaOOPFunctionDefs.RadarArea.cpp \
@@ -239,6 +237,7 @@ LOGIC = \
239237
./logic/luadefs/CLuaHandlingDefs.cpp \
240238
./logic/luadefs/CLuaHTTPDefs.cpp \
241239
./logic/luadefs/CLuaMatrixDefs.cpp \
240+
./logic/luadefs/CLuaMarkerDefs.cpp \
242241
./logic/luadefs/CLuaPickupDefs.cpp \
243242
./logic/luadefs/CLuaResourceDefs.cpp \
244243
./logic/luadefs/CLuaTextDefs.cpp \

‎MTA10_Server/mods/deathmatch/StdInc.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ struct SAclRequest;
119119
#include "luadefs/CLuaFileDefs.h"
120120
#include "luadefs/CLuaHTTPDefs.h"
121121
#include "luadefs/CLuaHandlingDefs.h"
122+
#include "luadefs/CLuaMarkerDefs.h"
122123
#include "luadefs/CLuaPickupDefs.h"
123124
#include "luadefs/CLuaResourceDefs.h"
124125
#include "luadefs/CLuaTextDefs.h"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@
450450
<ClCompile Include="CServer.cpp" />
451451
<ClCompile Include="..\..\sdk\MTAPlatform.cpp" />
452452
<ClCompile Include="logic\CPerfStat.PlayerPacketUsage.cpp" />
453+
<ClCompile Include="logic\luadefs\CLuaMarkerDefs.cpp" />
453454
<ClCompile Include="logic\luadefs\CLuaMatrixDefs.cpp" />
454455
<ClCompile Include="logic\luadefs\CLuaVector2Defs.cpp" />
455456
<ClCompile Include="logic\luadefs\CLuaVector3Defs.cpp" />
@@ -463,7 +464,6 @@
463464
<ClCompile Include="logic\lua\CLuaFunctionDefs.Crypt.cpp" />
464465
<ClCompile Include="logic\lua\CLuaFunctionDefs.Database.cpp" />
465466
<ClCompile Include="logic\lua\CLuaFunctionDefs.Event.cpp" />
466-
<ClCompile Include="logic\lua\CLuaFunctionDefs.Marker.cpp" />
467467
<ClCompile Include="logic\lua\CLuaFunctionDefs.Misc.cpp" />
468468
<ClCompile Include="logic\lua\CLuaFunctionDefs.Object.cpp" />
469469
<ClCompile Include="logic\lua\CLuaFunctionDefs.Ped.cpp" />
@@ -481,7 +481,6 @@
481481
<ClCompile Include="logic\lua\CLuaVector2.cpp" />
482482
<ClCompile Include="logic\lua\CLuaVector3.cpp" />
483483
<ClCompile Include="logic\lua\CLuaVector4.cpp" />
484-
<ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Marker.cpp" />
485484
<ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Ped.cpp" />
486485
<ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Player.cpp" />
487486
<ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Connection.cpp" />
@@ -882,6 +881,7 @@
882881
<ClInclude Include="Config.h" />
883882
<ClInclude Include="..\..\..\vendor\zip\crypt.h" />
884883
<ClInclude Include="CServer.h" />
884+
<ClInclude Include="logic\luadefs\CLuaMarkerDefs.h" />
885885
<ClInclude Include="logic\luadefs\CLuaMatrixDefs.h" />
886886
<ClInclude Include="logic\luadefs\CLuaVector2Defs.h" />
887887
<ClInclude Include="logic\luadefs\CLuaVector3Defs.h" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -915,18 +915,12 @@
915915
<ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Player.cpp">
916916
<Filter>Source Files\logic\oopdefs</Filter>
917917
</ClCompile>
918-
<ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Marker.cpp">
919-
<Filter>Source Files\logic\oopdefs</Filter>
920-
</ClCompile>
921918
<ClCompile Include="logic\lua\oopdefs\CLuaOOPFunctionDefs.Connection.cpp">
922919
<Filter>Source Files\logic\oopdefs</Filter>
923920
</ClCompile>
924921
<ClCompile Include="logic\lua\CLuaFunctionDefs.cpp">
925922
<Filter>Source Files\logic\lua</Filter>
926923
</ClCompile>
927-
<ClCompile Include="logic\lua\CLuaFunctionDefs.Marker.cpp">
928-
<Filter>Source Files\logic\lua</Filter>
929-
</ClCompile>
930924
<ClCompile Include="logic\lua\CLuaFunctionDefs.Database.cpp">
931925
<Filter>Source Files\logic\lua</Filter>
932926
</ClCompile>
@@ -999,6 +993,9 @@
999993
<ClCompile Include="logic\luadefs\CLuaVehicleDefs.cpp">
1000994
<Filter>Source Files\logic\luadefs</Filter>
1001995
</ClCompile>
996+
<ClCompile Include="logic\luadefs\CLuaMarkerDefs.cpp">
997+
<Filter>Source Files\logic\luadefs</Filter>
998+
</ClCompile>
1002999
</ItemGroup>
10031000
<ItemGroup>
10041001
<ClInclude Include="logic\CLightsyncManager.h">
@@ -1865,6 +1862,9 @@
18651862
<ClInclude Include="logic\luadefs\CLuaVehicleDefs.h">
18661863
<Filter>Header Files\logic\luadefs</Filter>
18671864
</ClInclude>
1865+
<ClInclude Include="logic\luadefs\CLuaMarkerDefs.h">
1866+
<Filter>Header Files\logic\luadefs</Filter>
1867+
</ClInclude>
18681868
</ItemGroup>
18691869
<ItemGroup>
18701870
<Xml Include="acl.xml">

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -177,25 +177,7 @@ class CLuaFunctionDefs
177177
LUA_DECLARE ( TakeWeapon );
178178
LUA_DECLARE ( TakeAllWeapons );
179179
LUA_DECLARE ( SetWeaponAmmo );
180-
LUA_DECLARE ( GetSlotFromWeapon );
181-
182-
// Marker create/destroy functions
183-
LUA_DECLARE ( CreateMarker );
184-
185-
// Marker get functions
186-
LUA_DECLARE ( GetMarkerCount );
187-
LUA_DECLARE ( GetMarkerType );
188-
LUA_DECLARE ( GetMarkerSize );
189-
LUA_DECLARE ( GetMarkerColor );
190-
LUA_DECLARE ( GetMarkerTarget );
191-
LUA_DECLARE ( GetMarkerIcon );
192-
193-
// Marker set functions
194-
LUA_DECLARE ( SetMarkerType );
195-
LUA_DECLARE ( SetMarkerSize );
196-
LUA_DECLARE ( SetMarkerColor );
197-
LUA_DECLARE ( SetMarkerTarget );
198-
LUA_DECLARE ( SetMarkerIcon );
180+
LUA_DECLARE ( GetSlotFromWeapon );
199181

200182
// Blip create/destroy functions
201183
LUA_DECLARE ( CreateBlip );

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

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -279,36 +279,6 @@ void CLuaMain::AddColShapeClass ( lua_State* luaVM )
279279
}
280280

281281

282-
void CLuaMain::AddMarkerClass ( lua_State* luaVM )
283-
{
284-
lua_newclass ( luaVM );
285-
286-
lua_classfunction ( luaVM, "create", "createMarker" );
287-
lua_classfunction ( luaVM, "getCount", "getMarkerCount" );
288-
289-
lua_classfunction ( luaVM, "getMarkerType", "getMarkerType" );
290-
lua_classfunction ( luaVM, "getIcon", "getMarkerIcon" );
291-
lua_classfunction ( luaVM, "getSize", "getMarkerSize" );
292-
lua_classfunction ( luaVM, "getTarget", "getMarkerTarget", CLuaOOPDefs::GetMarkerTarget );
293-
lua_classfunction ( luaVM, "getColor", "getMarkerColor" ); // color
294-
295-
lua_classfunction ( luaVM, "setType", "setMarkerType" );
296-
lua_classfunction ( luaVM, "setIcon", "setMarkerIcon" );
297-
lua_classfunction ( luaVM, "setSize", "setMarkerSize" );
298-
lua_classfunction ( luaVM, "setTarget", "setMarkerTarget" );
299-
lua_classfunction ( luaVM, "setColor", "setMarkerColor" ); // color
300-
301-
lua_classvariable ( luaVM, "markerType", "setMarkerType", "getMarkerType" );
302-
lua_classvariable ( luaVM, "icon", "setMarkerIcon", "getMarkerIcon" );
303-
lua_classvariable ( luaVM, "size", "setMarkerSize", "getMarkerSize" );
304-
305-
lua_classvariable ( luaVM, "target", "setMarkerTarget", "getMarkerTarget", CLuaFunctionDefs::SetMarkerTarget, CLuaOOPDefs::GetMarkerTarget );
306-
//lua_classvariable ( luaVM, "color", CLuaOOPDefs::SetMarkerColor, CLuaOOPDefs::GetMarkerColor ); color
307-
308-
lua_registerclass ( luaVM, "Marker", "Element" );
309-
}
310-
311-
312282
void CLuaMain::AddObjectClass ( lua_State* luaVM )
313283
{
314284
lua_newclass ( luaVM );
@@ -724,11 +694,12 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
724694
CLuaTextDefs ::AddClasses ( luaVM );
725695
CLuaACLDefs ::AddClasses ( luaVM );
726696
CLuaVehicleDefs ::AddClass ( luaVM );
697+
CLuaMarkerDefs ::AddClass ( luaVM );
727698
AddAccountClass ( luaVM );
728699
AddBanClass ( luaVM );
729700
AddBlipClass ( luaVM );
730701
AddColShapeClass ( luaVM );
731-
AddMarkerClass ( luaVM );
702+
732703
AddObjectClass ( luaVM );
733704
AddPedClass ( luaVM );
734705
AddPlayerClass ( luaVM );

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ class CLuaMain //: public CClient
133133
void AddBanClass ( lua_State* luaVM );
134134
void AddBlipClass ( lua_State* luaVM );
135135
void AddColShapeClass ( lua_State* luaVM );
136-
void AddMarkerClass ( lua_State* luaVM );
137136
void AddObjectClass ( lua_State* luaVM );
138137
void AddPedClass ( lua_State* luaVM );
139138
void AddPlayerClass ( lua_State* luaVM );

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

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -302,25 +302,7 @@ void CLuaManager::LoadCFunctions ( void )
302302
CLuaCFunctions::AddFunction ( "giveWeaponAmmo", CLuaFunctionDefs::GiveWeapon );
303303
CLuaCFunctions::AddFunction ( "takeWeaponAmmo", CLuaFunctionDefs::TakeWeapon );
304304
CLuaCFunctions::AddFunction ( "setWeaponAmmo", CLuaFunctionDefs::SetWeaponAmmo );
305-
CLuaCFunctions::AddFunction ( "getSlotFromWeapon", CLuaFunctionDefs::GetSlotFromWeapon );
306-
307-
// Marker functions
308-
CLuaCFunctions::AddFunction ( "createMarker", CLuaFunctionDefs::CreateMarker );
309-
310-
// Marker get functions
311-
CLuaCFunctions::AddFunction ( "getMarkerCount", CLuaFunctionDefs::GetMarkerCount );
312-
CLuaCFunctions::AddFunction ( "getMarkerType", CLuaFunctionDefs::GetMarkerType );
313-
CLuaCFunctions::AddFunction ( "getMarkerSize", CLuaFunctionDefs::GetMarkerSize );
314-
CLuaCFunctions::AddFunction ( "getMarkerColor", CLuaFunctionDefs::GetMarkerColor );
315-
CLuaCFunctions::AddFunction ( "getMarkerTarget", CLuaFunctionDefs::GetMarkerTarget );
316-
CLuaCFunctions::AddFunction ( "getMarkerIcon", CLuaFunctionDefs::GetMarkerIcon );
317-
318-
// Marker set functions
319-
CLuaCFunctions::AddFunction ( "setMarkerType", CLuaFunctionDefs::SetMarkerType );
320-
CLuaCFunctions::AddFunction ( "setMarkerSize", CLuaFunctionDefs::SetMarkerSize );
321-
CLuaCFunctions::AddFunction ( "setMarkerColor", CLuaFunctionDefs::SetMarkerColor );
322-
CLuaCFunctions::AddFunction ( "setMarkerTarget", CLuaFunctionDefs::SetMarkerTarget );
323-
CLuaCFunctions::AddFunction ( "setMarkerIcon", CLuaFunctionDefs::SetMarkerIcon );
305+
CLuaCFunctions::AddFunction ( "getSlotFromWeapon", CLuaFunctionDefs::GetSlotFromWeapon );
324306

325307
// Blip create/destroy funcs
326308
CLuaCFunctions::AddFunction ( "createBlip", CLuaFunctionDefs::CreateBlip );
@@ -534,6 +516,7 @@ void CLuaManager::LoadCFunctions ( void )
534516
CLuaWorldDefs::LoadFunctions ();
535517
CLuaVoiceDefs::LoadFunctions ();
536518
CLuaXMLDefs::LoadFunctions ();
519+
CLuaMarkerDefs::LoadFunctions ();
537520

538521
// All-Seeing Eye Functions
539522
CLuaCFunctions::AddFunction ( "getGameType", CLuaFunctionDefs::GetGameType );

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ class CLuaOOPDefs : public CLuaDefs
2828
// Player
2929
LUA_DECLARE ( OutputChat );
3030

31-
// Marker
32-
LUA_DECLARE ( GetMarkerTarget );
33-
3431
// Connection
3532
LUA_DECLARE ( DbQuery );
3633

‎MTA10_Server/mods/deathmatch/logic/lua/oopdefs/CLuaOOPFunctionDefs.Marker.cpp‎

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

0 commit comments

Comments
 (0)