Clean up client Team luadefs

(cherry picked from commit efcbb6b)

Author: qaisjp

MTA10/mods/deathmatch/StdInc.h

@@ -126,6 +126,7 @@
 #include <luadefs/CLuaMatrixDefs.h>
 #include <luadefs/CLuaSearchLightDefs.h>
 #include <luadefs/CLuaTaskDefs.h>
+#include <luadefs/CLuaTeamDefs.h>
 #include <luadefs/CLuaFxDefs.h>
 #include <luadefs/CLuaFileDefs.h>
 #include <lua/oopdefs/CLuaOOPDefs.h>

MTA10/mods/deathmatch/_Deathmatch 2008.vcxproj

@@ -379,6 +379,7 @@
     <ClCompile Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaResourceDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaSearchLightDefs.cpp" />
+    <ClCompile Include="..\shared_logic\luadefs\CLuaTeamDefs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaVector2Defs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaVector3Defs.cpp" />
     <ClCompile Include="..\shared_logic\luadefs\CLuaVector4Defs.cpp" />
@@ -581,7 +582,6 @@
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Pickup.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Projectile.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Shape.cpp" />
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Team.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Util.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Voice.cpp" />
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Weapon.cpp" />
@@ -770,6 +770,7 @@
     <ClInclude Include="..\shared_logic\luadefs\CLuaRadarAreaDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaResourceDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaSearchLightDefs.h" />
+    <ClInclude Include="..\shared_logic\luadefs\CLuaTeamDefs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaVector2Defs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaVector3Defs.h" />
     <ClInclude Include="..\shared_logic\luadefs\CLuaVector4Defs.h" />

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

@@ -602,9 +602,6 @@
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Shape.cpp">
       <Filter>Source Files\shared_logic\lua</Filter>
     </ClCompile>
-    <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Team.cpp">
-      <Filter>Source Files\shared_logic\lua</Filter>
-    </ClCompile>
     <ClCompile Include="..\shared_logic\lua\CLuaFunctionDefs.Util.cpp">
       <Filter>Source Files\shared_logic\lua</Filter>
     </ClCompile>
@@ -926,6 +923,9 @@
     <ClCompile Include="..\shared_logic\luadefs\CLuaResourceDefs.cpp">
       <Filter>Source Files\shared_logic\luadefs</Filter>
     </ClCompile>
+    <ClCompile Include="..\shared_logic\luadefs\CLuaTeamDefs.cpp">
+      <Filter>Source Files\shared_logic\luadefs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CClient.h">
@@ -1693,5 +1693,8 @@
     <ClInclude Include="..\shared_logic\luadefs\CLuaResourceDefs.h">
       <Filter>Header Files\shared_logic\luadefs</Filter>
     </ClInclude>
+    <ClInclude Include="..\shared_logic\luadefs\CLuaTeamDefs.h">
+      <Filter>Header Files\shared_logic\luadefs</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

MTA10/mods/shared_logic/lua/CLuaFunctionDefs.h

@@ -465,14 +465,6 @@ class CLuaFunctionDefs
     LUA_DECLARE ( CreateColPolygon );
     LUA_DECLARE ( CreateColTube );
 
-    // Team get funcs  
-    LUA_DECLARE ( GetTeamFromName );
-    LUA_DECLARE ( GetTeamName  );
-    LUA_DECLARE ( GetTeamColor );
-    LUA_DECLARE ( GetTeamFriendlyFire );
-    LUA_DECLARE ( GetPlayersInTeam );
-    LUA_DECLARE ( CountPlayersInTeam );
-
     // Weapon funcs
     LUA_DECLARE ( GetWeaponNameFromID );
     LUA_DECLARE ( GetWeaponIDFromName );

MTA10/mods/shared_logic/lua/CLuaMain.cpp

@@ -196,28 +196,6 @@ void CLuaMain::AddProjectileClass ( lua_State* luaVM )
     lua_registerclass ( luaVM, "Projectile", "Element" );
 }
 
-
-// TODO: specials
-void CLuaMain::AddTeamClass ( lua_State* luaVM )
-{
-    lua_newclass ( luaVM );
-
-    lua_classfunction ( luaVM, "create", "getTeamFromName" );
-    lua_classfunction ( luaVM, "getFromName", "getTeamFromName" );
-    lua_classfunction ( luaVM, "countPlayers", "countPlayersInTeam" );
-    lua_classfunction ( luaVM, "getFriendlyFire", "getTeamFriendlyFire" );
-    lua_classfunction ( luaVM, "getName", "getTeamName" );
-    lua_classfunction ( luaVM, "getColor", "getTeamColor" );
-    
-    lua_classvariable ( luaVM, "playerCount", NULL, "countPlayersInTeam" );
-    lua_classvariable ( luaVM, "friendlyFire", NULL, "getTeamFriendlyFire" );
-    lua_classvariable ( luaVM, "name", NULL, "getTeamName" );
-    //lua_classvariable ( luaVM, "color", NULL, "getTeamColor" );
-    
-    lua_registerclass ( luaVM, "Team", "Element" );
-}
-
-
 // TODO: specials
 void CLuaMain::AddWaterClass ( lua_State* luaVM )
 {
@@ -896,7 +874,6 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
     AddColShapeClass            ( luaVM );
     AddProjectileClass          ( luaVM );
 
-    AddTeamClass                ( luaVM );
     AddWaterClass               ( luaVM );
     CLuaAudioDefs::AddClass     ( luaVM );
     AddWeaponClass              ( luaVM );
@@ -946,6 +923,7 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
     CLuaRadarAreaDefs::AddClass ( luaVM );
     CLuaResourceDefs::AddClass ( luaVM );
     CLuaSearchLightDefs::AddClass ( luaVM );
+    CLuaTeamDefs::AddClass ( luaVM );
     CLuaVehicleDefs::AddClass ( luaVM );
 }
 

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                            AddTeamClass            ( lua_State* luaVM );
     void                            AddWaterClass           ( lua_State* luaVM );
     void                            AddWeaponClass          ( lua_State* luaVM );
     void                            AddEffectClass          ( lua_State* luaVM );

MTA10/mods/shared_logic/lua/CLuaManager.cpp

@@ -653,14 +653,6 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaCFunctions::AddFunction ( "createColPolygon", CLuaFunctionDefs::CreateColPolygon );
     CLuaCFunctions::AddFunction ( "createColTube", CLuaFunctionDefs::CreateColTube );
 
-    // Team get funcs
-    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 );
-
     // Weapon funcs
     CLuaCFunctions::AddFunction ( "getWeaponNameFromID", CLuaFunctionDefs::GetWeaponNameFromID );
     CLuaCFunctions::AddFunction ( "getWeaponIDFromName", CLuaFunctionDefs::GetWeaponIDFromName );
@@ -755,5 +747,6 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaResourceDefs::LoadFunctions ();
     CLuaSearchLightDefs::LoadFunctions ();
     CLuaTaskDefs::LoadFunctions ();
+    CLuaTeamDefs::LoadFunctions ();
     CLuaVehicleDefs::LoadFunctions ();
 }