Remove Team_t, move all common typedefs to subfolder common

Author: ampreeT

scripting/include/srccoop/manager.inc

@@ -561,7 +561,7 @@ methodmap CoopManager
 	 * Must be called after teams had been created.
 	 * Returns -1 on failure / if teams are not to be enforced.
 	 */
-	public static Team_t GetEnforcedTeam()
+	public static int GetEnforcedTeam()
 	{
 		char szTeam[MAX_TEAMNAME];
 		g_pConvarCoopTeam.GetString(szTeam, sizeof(szTeam));
@@ -572,7 +572,7 @@ methodmap CoopManager
 			iTeam = FindTeamByName(szTeam);
 		}
 
-		return (view_as<Team_t>(iTeam) > TEAM_SPECTATOR) ? view_as<Team_t>(iTeam) : TEAM_INVALID;
+		return (iTeam > TEAM_SPECTATOR) ? iTeam : TEAM_INVALID;
 	}
 }
 

scripting/include/srccoop/manager_survival.inc

@@ -166,7 +166,7 @@ methodmap SurvivalManager {
 		return true;
 	}
 
-	public static void OnPlayerChangeTeam(const CBasePlayer pPlayer, const Team_t eTeam)
+	public static void OnPlayerChangeTeam(const CBasePlayer pPlayer, const int iTeam)
 	{
 		if (SurvivalManager.GetMode())
 		{

scripting/include/srccoop/playerpatch.inc

@@ -735,16 +735,17 @@ public MRESReturn Hook_PlayerChangeTeam(int iClient, DHookParam hParams)
 		if (!CMultiplayRules.IsTeamplay())
 			return MRES_Ignored;
 
-		Team_t eTeam = hParams.Get(1);
-		if (eTeam == TEAM_UNASSIGNED || eTeam > TEAM_SPECTATOR)
+		int iTeam = hParams.Get(1);
+		if (iTeam == TEAM_UNASSIGNED || iTeam > TEAM_SPECTATOR)
 		{
-			Team_t eEnforcedTeam = CoopManager.GetEnforcedTeam();
-			if (eEnforcedTeam != TEAM_INVALID)
+			int iEnforcedTeam = CoopManager.GetEnforcedTeam();
+			if (iEnforcedTeam != TEAM_INVALID)
 			{
-				hParams.Set(1, eEnforcedTeam);
+				hParams.Set(1, iEnforcedTeam);
 				return MRES_ChangedHandled;
 			}
-			if (eTeam == TEAM_UNASSIGNED)
+			
+			if (iTeam == TEAM_UNASSIGNED)
 			{
 				hParams.Set(1, TEAM_SCIENTIST);
 				return MRES_ChangedHandled;
@@ -759,8 +760,8 @@ public MRESReturn Hook_PlayerChangeTeamPost(int iClient, Handle hParams)
 	if (CoopManager.IsCoopModeEnabled())
 	{
 		CBasePlayer pPlayer = CBasePlayer(iClient);
-		Team_t eTeam = DHookGetParam(hParams, 1);
-		if (eTeam == TEAM_SPECTATOR)
+		int iTeam = DHookGetParam(hParams, 1);
+		if (iTeam == TEAM_SPECTATOR)
 		{
 			CBaseEntity pRagdoll = pPlayer.GetRagdoll();
 			if (pRagdoll != NULL_CBASEENTITY)
@@ -770,7 +771,7 @@ public MRESReturn Hook_PlayerChangeTeamPost(int iClient, Handle hParams)
 			ClearNpcMemoryForPlayer(pPlayer);
 		}
 
-		SurvivalManager.OnPlayerChangeTeam(pPlayer, eTeam);
+		SurvivalManager.OnPlayerChangeTeam(pPlayer, iTeam);
 	}
 	return MRES_Ignored;
 }

scripting/include/srccoop/utils.inc

@@ -687,7 +687,7 @@ stock CBasePlayer GetNearestPlayerEx(float vecPos[3], bool bAliveOnly = true, bo
 			if (!bAlive)
 				continue;
 		}
-		else if (bNoSpectators && view_as<Team_t>(GetClientTeam(i)) == TEAM_SPECTATOR)
+		else if (bNoSpectators && GetClientTeam(i) == TEAM_SPECTATOR)
 		{
 			continue;
 		}
@@ -728,7 +728,7 @@ stock int GetRealClientCount(bool bInGameOnly, bool bAliveOnly = false, bool bNo
 		if ((bInGameOnly? IsClientInGame(i) : IsClientConnected(i))
 			&& !IsFakeClient(i)
 			&& (!bAliveOnly || IsPlayerAlive(i))
-			&& (!bNoSpectators || view_as<Team_t>(GetClientTeam(i)) != TEAM_SPECTATOR))
+			&& (!bNoSpectators || GetClientTeam(i) != TEAM_SPECTATOR))
 		{
  			clients++;
  		}

scripting/include/srccoop_api/classdef/common/CBaseAnimating.inc

@@ -143,7 +143,7 @@ methodmap CBaseAnimating < CBaseEntity
 		SetEntProp(this.entindex, Prop_Send, "m_nForceBone", iForceBone);
 	}
 	#if defined SRCCOOP_BLACKMESA
-	public int SelectWeightedSequence(const Activity_t eActivity)
+	public int SelectWeightedSequence(const Activity eActivity)
 	{
 		// TODO:
 		// This is currently only implemented in Black Mesa but it may be required for others.

scripting/include/srccoop_api/classdef/common/CBaseCombatWeapon.inc

@@ -119,7 +119,7 @@ methodmap CBaseCombatWeapon < CBaseAnimating
 	{
 		SetEntPropFloat(this.entindex, Prop_Data, "m_flTimeWeaponIdle", flTimeIdle);
 	}
-	public bool SendWeaponAnim(const Activity_t eActivity)
+	public bool SendWeaponAnim(const Activity eActivity)
 	{
 		return SDKCall(g_pSendWeaponAnim, this.entindex, eActivity);
 	}

scripting/include/srccoop_api/classdef/common/CBaseEntity.inc

@@ -263,9 +263,9 @@ methodmap CBaseEntity
 	{
 		return this.OutputAdd("OnUser1", "!self", "kill", _, flTime) && this.AcceptInput("FireUser1");
 	}
-	public Team_t GetTeam()
+	public int GetTeam()
 	{
-		return view_as<Team_t>(GetEntProp(this.entindex, Prop_Data, "m_iTeamNum"));
+		return GetEntProp(this.entindex, Prop_Data, "m_iTeamNum");
 	}
 	public void GetEyePosition(float vec3Buffer[3])
 	{

scripting/include/srccoop_api/classdef/common/CBasePlayer.inc

@@ -338,9 +338,9 @@ methodmap CBasePlayer < CBaseCombatCharacter
 			this.SetHideHud(eHideHUD | HIDEHUD_CROSSHAIR);
 		}
 	}
-	public void SetTeam(const Team_t eTeam)
+	public void SetTeam(const int iTeam)
 	{
-		ChangeClientTeam(this.entindex, view_as<int>(eTeam));
+		ChangeClientTeam(this.entindex, iTeam);
 	}
 	public CBaseEntity GetUseEntity()
 	{

scripting/include/srccoop_api/typedef.inc

@@ -115,34 +115,34 @@
 #define SF_PHYSBOX_PREVENT_PLAYER_TOUCH_ENABLE 0x800000		// If set, the player will not cause the object to enable its motion when bumped into
 */
 
-#include <srccoop_api/typedef/Activity_t.inc>
-#include <srccoop_api/typedef/AI_Efficiency_t.inc>
-#include <srccoop_api/typedef/AI_Schedule_t.inc>
-#include <srccoop_api/typedef/AI_SleepFlags_t.inc>
-#include <srccoop_api/typedef/AI_SleepState_t.inc>
-#include <srccoop_api/typedef/AmmoType_t.inc>
-#include <srccoop_api/typedef/BeamType_t.inc>
-#include <srccoop_api/typedef/Class_T.inc>
-#include <srccoop_api/typedef/Collision_Group_t.inc>
-#include <srccoop_api/typedef/Disposition_t.inc>
-#include <srccoop_api/typedef/EntityDissolveType_t.inc>
-#include <srccoop_api/typedef/fieldtype_t.inc>
-#include <srccoop_api/typedef/GLOBALESTATE.inc> 
-#include <srccoop_api/typedef/GoalType_t.inc>
-#include <srccoop_api/typedef/HideHudFlags_t.inc>
-#include <srccoop_api/typedef/LifeState_t.inc>
-#include <srccoop_api/typedef/MoveCollide_t.inc>
-#include <srccoop_api/typedef/NPC_STATE.inc>
-#include <srccoop_api/typedef/Obs_Mode.inc>
-#include <srccoop_api/typedef/SCOND_t.inc>
-#include <srccoop_api/typedef/ScreenFadeFlags_t.inc>
-#include <srccoop_api/typedef/sharedtasks_e.inc>
-#include <srccoop_api/typedef/SolidType_t.inc>
-#include <srccoop_api/typedef/sounds.inc>
-#include <srccoop_api/typedef/TakeDamage_t.inc>
-#include <srccoop_api/typedef/Team_t.inc>
-#include <srccoop_api/typedef/USE_TYPE.inc>
-#include <srccoop_api/typedef/WaterLevel_t.inc>
+#include <srccoop_api/typedef/common/Activity.inc>
+#include <srccoop_api/typedef/common/AI_Efficiency_t.inc>
+#include <srccoop_api/typedef/common/AI_Schedule_t.inc>
+#include <srccoop_api/typedef/common/AI_SleepFlags_t.inc>
+#include <srccoop_api/typedef/common/AI_SleepState_t.inc>
+#include <srccoop_api/typedef/common/AmmoType_t.inc>
+#include <srccoop_api/typedef/common/BeamType_t.inc>
+#include <srccoop_api/typedef/common/Class_T.inc>
+#include <srccoop_api/typedef/common/Collision_Group_t.inc>
+#include <srccoop_api/typedef/common/Disposition_t.inc>
+#include <srccoop_api/typedef/common/EntityDissolveType_t.inc>
+#include <srccoop_api/typedef/common/fieldtype_t.inc>
+#include <srccoop_api/typedef/common/GLOBALESTATE.inc> 
+#include <srccoop_api/typedef/common/GoalType_t.inc>
+#include <srccoop_api/typedef/common/HideHudFlags_t.inc>
+#include <srccoop_api/typedef/common/LifeState_t.inc>
+#include <srccoop_api/typedef/common/MoveCollide_t.inc>
+#include <srccoop_api/typedef/common/NPC_STATE.inc>
+#include <srccoop_api/typedef/common/Obs_Mode.inc>
+#include <srccoop_api/typedef/common/SCOND_t.inc>
+#include <srccoop_api/typedef/common/ScreenFadeFlags_t.inc>
+#include <srccoop_api/typedef/common/sharedtasks_e.inc>
+#include <srccoop_api/typedef/common/SolidType_t.inc>
+#include <srccoop_api/typedef/common/sounds.inc>
+#include <srccoop_api/typedef/common/TakeDamage_t.inc>
+#include <srccoop_api/typedef/common/Team_t.inc>
+#include <srccoop_api/typedef/common/USE_TYPE.inc>
+#include <srccoop_api/typedef/common/WaterLevel_t.inc>
 
 #if defined SRCCOOP_BLACKMESA
 #include <srccoop_api/typedef/bms/gamerules.inc>

scripting/include/srccoop_api/typedef/AI_Efficiency_t.inc renamed to scripting/include/srccoop_api/typedef/common/AI_Efficiency_t.inc

@@ -4,7 +4,7 @@
 //------------------------------------------------------
 // BMS specific activity list
 //------------------------------------------------------
-enum Activity_t
+enum Activity
 {
 	ACT_INVALID = -1,			// So we have something more succint to check for than '-1'
 	ACT_RESET = 0,				// Set m_Activity to this invalid value to force a reset to m_IdealActivity

scripting/include/srccoop_api/typedef/AI_Schedule_t.inc renamed to scripting/include/srccoop_api/typedef/common/AI_Schedule_t.inc

@@ -1,7 +1,7 @@
 #pragma newdecls required
 #pragma semicolon 1
 
-enum Team_t
+enum
 {
 	TEAM_ANY = -2,
 	TEAM_INVALID = -1,

scripting/include/srccoop_api/typedef/AI_SleepFlags_t.inc renamed to scripting/include/srccoop_api/typedef/common/AI_SleepFlags_t.inc

@@ -65,8 +65,8 @@ public void Event_PlayerChangeTeam(Event hEvent, const char[] szName, bool bDont
 	int client = GetClientOfUserId(hEvent.GetInt("userid"));
 	if (!bHidden[client])
 	{
-		Team_t eTeam = view_as<Team_t>(hEvent.GetInt("team"));
-		if (eTeam == TEAM_SCIENTIST || eTeam == TEAM_MARINES || eTeam == TEAM_UNASSIGNED)
+		int iTeam = hEvent.GetInt("team");
+		if (iTeam == TEAM_SCIENTIST || iTeam == TEAM_MARINES || iTeam == TEAM_UNASSIGNED)
 		{
 			ClientCommand(client, "r_screenoverlay 0");
 			bHidden[client] = true;