[luadefs-server] Clean up Team

MTA10_Server/mods/deathmatch/Makefile.am

@@ -200,7 +200,6 @@ LOGIC = \
 ./logic/lua/CLuaFunctionDefs.PREG.cpp \
 ./logic/lua/CLuaFunctionDefs.RadarArea.cpp \
 ./logic/lua/CLuaFunctionDefs.Server.cpp \
-./logic/lua/CLuaFunctionDefs.Team.cpp \
 ./logic/lua/CLuaFunctionDefs.Timer.cpp \
 ./logic/lua/CLuaFunctionDefs.UTF.cpp \
 ./logic/lua/CLuaFunctionDefs.Utility.cpp \
@@ -239,6 +238,7 @@ LOGIC = \
 ./logic/luadefs/CLuaPickupDefs.cpp \
 ./logic/luadefs/CLuaPlayerDefs.cpp \
 ./logic/luadefs/CLuaResourceDefs.cpp \
+./logic/luadefs/CLuaTeamDefs.cpp \
 ./logic/luadefs/CLuaTextDefs.cpp \
 ./logic/luadefs/CLuaVector2Defs.cpp \
 ./logic/luadefs/CLuaVector3Defs.cpp \

MTA10_Server/mods/deathmatch/StdInc.h

@@ -125,6 +125,7 @@ struct SAclRequest;
 #include "luadefs/CLuaPickupDefs.h"
 #include "luadefs/CLuaPlayerDefs.h"
 #include "luadefs/CLuaResourceDefs.h"
+#include "luadefs/CLuaTeamDefs.h"
 #include "luadefs/CLuaTextDefs.h"
 #include "luadefs/CLuaWorldDefs.h"
 #include "luadefs/CLuaVehicleDefs.h"

MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj

@@ -455,6 +455,7 @@
     <ClCompile Include="logic\luadefs\CLuaMatrixDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaPedDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaPlayerDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaTeamDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaVector2Defs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaVector3Defs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaVector4Defs.cpp" />
@@ -471,7 +472,6 @@
     <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.Team.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Timer.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.UTF.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Utility.cpp" />
@@ -885,6 +885,7 @@
     <ClInclude Include="logic\luadefs\CLuaMatrixDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaPedDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaPlayerDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaTeamDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaVector2Defs.h" />
     <ClInclude Include="logic\luadefs\CLuaVector3Defs.h" />
     <ClInclude Include="logic\luadefs\CLuaVector4Defs.h" />

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

@@ -927,9 +927,6 @@
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Event.cpp">
       <Filter>Source Files\logic\lua</Filter>
     </ClCompile>
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Team.cpp">
-      <Filter>Source Files\logic\lua</Filter>
-    </ClCompile>
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Server.cpp">
       <Filter>Source Files\logic\lua</Filter>
     </ClCompile>
@@ -993,6 +990,9 @@
     <ClCompile Include="logic\luadefs\CLuaBlipDefs.cpp">
       <Filter>Source Files\logic\luadefs</Filter>
     </ClCompile>
+    <ClCompile Include="logic\luadefs\CLuaTeamDefs.cpp">
+      <Filter>Source Files\logic\luadefs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="logic\CLightsyncManager.h">
@@ -1871,6 +1871,9 @@
     <ClInclude Include="logic\luadefs\CLuaBlipDefs.h">
       <Filter>Header Files\logic\luadefs</Filter>
     </ClInclude>
+    <ClInclude Include="logic\luadefs\CLuaTeamDefs.h">
+      <Filter>Header Files\logic\luadefs</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="acl.xml">

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

@@ -119,21 +119,6 @@ class CLuaFunctionDefs
     LUA_DECLARE ( CreateColPolygon );
     LUA_DECLARE ( CreateColTube );
 
-    // Team get funcs
-    LUA_DECLARE ( CreateTeam );
-    LUA_DECLARE ( GetTeamFromName );
-    LUA_DECLARE ( GetTeamName );
-    LUA_DECLARE ( GetTeamColor );
-    LUA_DECLARE ( GetTeamFriendlyFire );
-    LUA_DECLARE ( GetPlayersInTeam );
-    LUA_DECLARE ( CountPlayersInTeam );
-
-    // Team set funcs
-    LUA_DECLARE ( SetPlayerTeam );
-    LUA_DECLARE ( SetTeamName );
-    LUA_DECLARE ( SetTeamColor );
-    LUA_DECLARE ( SetTeamFriendlyFire );
-
     // Water funcs
     LUA_DECLARE ( CreateWater );
     LUA_DECLARE ( SetWaterLevel );

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

@@ -311,33 +311,6 @@ void CLuaMain::AddQueryHandleClass ( lua_State* luaVM )
 }
 
 
-void CLuaMain::AddTeamClass ( lua_State* luaVM )
-{
-    lua_newclass ( luaVM );
-
-    lua_classfunction ( luaVM, "create", "createTeam" );
-    lua_classfunction ( luaVM, "getFromName", "getTeamFromName" );
-    lua_classfunction ( luaVM, "countPlayers", "countPlayersInTeam" );
-    lua_classfunction ( luaVM, "getPlayers", "getPlayersInTeam" );
-
-    lua_classfunction ( luaVM, "getFriendlyFire", "getTeamFriendlyFire" );
-    lua_classfunction ( luaVM, "getName", "getTeamName" );
-    lua_classfunction ( luaVM, "getColor", "getTeamColor" );
-
-    lua_classfunction ( luaVM, "setName", "setTeamName" );
-    lua_classfunction ( luaVM, "setColor", "setTeamColor" );
-    lua_classfunction ( luaVM, "setFriendlyFire", "setTeamFriendlyFire" );
-
-    lua_classvariable ( luaVM, "playerCount", NULL, "countPlayersInTeam" );
-    lua_classvariable ( luaVM, "friendlyFire", "setTeamFriendlyFire", "getTeamFriendlyFire" );
-    lua_classvariable ( luaVM, "players", NULL, "getPlayersInTeam" ); // todo: perhaps table.insert/nilvaluing?
-    lua_classvariable ( luaVM, "name", "setTeamName", "getTeamName" );
-    //lua_classvariable ( luaVM, "color", "setTeamColor", "getTeamColor" );
-
-    lua_registerclass ( luaVM, "Team", "Element" );
-}
-
-
 void CLuaMain::AddWaterClass ( lua_State* luaVM )
 {
     lua_newclass ( luaVM );
@@ -413,14 +386,14 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
     CLuaPlayerDefs      ::AddClass   ( luaVM );
     CLuaResourceDefs    ::AddClass   ( luaVM );
     CLuaBlipDefs        ::AddClass   ( luaVM );
+    CLuaTeamDefs        ::AddClass   ( luaVM );
     AddAccountClass             ( luaVM );
     AddBanClass                 ( luaVM );
     AddColShapeClass            ( luaVM );
     AddObjectClass              ( luaVM );
     AddRadarAreaClass           ( luaVM );
     AddConnectionClass          ( luaVM );
     AddQueryHandleClass         ( luaVM );
-    AddTeamClass                ( luaVM );
     AddWaterClass               ( luaVM );
     AddTimerClass               ( luaVM );
 }

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

@@ -134,7 +134,6 @@ class CLuaMain //: public CClient
     void                            AddRadarAreaClass       ( lua_State* luaVM );
     void                            AddConnectionClass      ( lua_State* luaVM );
     void                            AddQueryHandleClass     ( lua_State* luaVM );
-    void                            AddTeamClass            ( lua_State* luaVM );
     void                            AddWaterClass           ( lua_State* luaVM );
     void                            AddTimerClass           ( lua_State* luaVM );
 

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

@@ -228,21 +228,6 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaCFunctions::AddFunction ( "getClothesByTypeIndex", CLuaFunctionDefs::GetClothesByTypeIndex );
     CLuaCFunctions::AddFunction ( "getTypeIndexFromClothes", CLuaFunctionDefs::GetTypeIndexFromClothes );
     CLuaCFunctions::AddFunction ( "getClothesTypeName", CLuaFunctionDefs::GetClothesTypeName );
-
-    // Team get funcs
-    CLuaCFunctions::AddFunction ( "createTeam", CLuaFunctionDefs::CreateTeam );
-    CLuaCFunctions::AddFunction ( "getTeamFromName", CLuaFunctionDefs::GetTeamFromName );
-    CLuaCFunctions::AddFunction ( "getTeamName", CLuaFunctionDefs::GetTeamName );
-    CLuaCFunctions::AddFunction ( "getTeamColor", CLuaFunctionDefs::GetTeamColor );
-    CLuaCFunctions::AddFunction ( "getTeamFriendlyFire", CLuaFunctionDefs::GetTeamFriendlyFire );
-    CLuaCFunctions::AddFunction ( "getPlayersInTeam", CLuaFunctionDefs::GetPlayersInTeam );
-    CLuaCFunctions::AddFunction ( "countPlayersInTeam", CLuaFunctionDefs::CountPlayersInTeam );
-
-    // Team set funcs
-    CLuaCFunctions::AddFunction ( "setPlayerTeam", CLuaFunctionDefs::SetPlayerTeam );
-    CLuaCFunctions::AddFunction ( "setTeamName", CLuaFunctionDefs::SetTeamName );
-    CLuaCFunctions::AddFunction ( "setTeamColor", CLuaFunctionDefs::SetTeamColor );
-    CLuaCFunctions::AddFunction ( "setTeamFriendlyFire", CLuaFunctionDefs::SetTeamFriendlyFire );
 
     // Shape create funcs
     CLuaCFunctions::AddFunction ( "createColCircle", CLuaFunctionDefs::CreateColCircle );
@@ -370,6 +355,7 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaPedDefs::LoadFunctions ();
     CLuaPlayerDefs::LoadFunctions ();
     CLuaBlipDefs::LoadFunctions ();
+    CLuaTeamDefs::LoadFunctions ();
 
     // All-Seeing Eye Functions
     CLuaCFunctions::AddFunction ( "getGameType", CLuaFunctionDefs::GetGameType );