Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Battlegrounds: Clean up some Team/TeamId parameters to use enums instead of raw integer types

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/1ef0c045202a6af33fb991f2ff765fa183ce976f)
This commit is contained in:
hondacrx
2024-02-04 16:31:49 -05:00
parent 00de526f7d
commit 5972f3b8a1
32 changed files with 360 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/BattleFields/BattleField.cs
+7 -7
View File
@@ -25,7 +25,7 @@ namespace Game.BattleFields
public BattleField(Map map)
{
m_IsEnabled = true;
m_DefenderTeam = TeamId.Neutral;
m_DefenderTeam = BatttleGroundTeamId.Neutral;
m_TimeForAcceptInvite = 20;
m_uiKickDontAcceptTimer = 1000;
@@ -705,7 +705,7 @@ namespace Game.BattleFields
// Battlefield - generic methods
public uint GetDefenderTeam() { return m_DefenderTeam; }
public uint GetAttackerTeam() { return 1 - m_DefenderTeam; }
public int GetOtherTeam(int teamIndex) { return (teamIndex == TeamId.Horde ? TeamId.Alliance : TeamId.Horde); }
public int GetOtherTeam(int teamIndex) { return (teamIndex == BatttleGroundTeamId.Horde ? BatttleGroundTeamId.Alliance : BatttleGroundTeamId.Horde); }
void SetDefenderTeam(uint team) { m_DefenderTeam = team; }
// Called on start
@@ -790,7 +790,7 @@ namespace Game.BattleFields
{
m_Bf = battlefield;
m_GraveyardId = 0;
m_ControlTeam = TeamId.Neutral;
m_ControlTeam = BatttleGroundTeamId.Neutral;
m_SpiritGuide[0] = ObjectGuid.Empty;
m_SpiritGuide[1] = ObjectGuid.Empty;
}
@@ -838,14 +838,14 @@ namespace Game.BattleFields
public bool HasNpc(ObjectGuid guid)
{
if (m_SpiritGuide[TeamId.Alliance].IsEmpty() || m_SpiritGuide[TeamId.Horde].IsEmpty())
if (m_SpiritGuide[BatttleGroundTeamId.Alliance].IsEmpty() || m_SpiritGuide[BatttleGroundTeamId.Horde].IsEmpty())
return false;
if (m_Bf.GetCreature(m_SpiritGuide[TeamId.Alliance]) == null ||
m_Bf.GetCreature(m_SpiritGuide[TeamId.Horde]) == null)
if (m_Bf.GetCreature(m_SpiritGuide[BatttleGroundTeamId.Alliance]) == null ||
m_Bf.GetCreature(m_SpiritGuide[BatttleGroundTeamId.Horde]) == null)
return false;
return (m_SpiritGuide[TeamId.Alliance] == guid || m_SpiritGuide[TeamId.Horde] == guid);
return (m_SpiritGuide[BatttleGroundTeamId.Alliance] == guid || m_SpiritGuide[BatttleGroundTeamId.Horde] == guid);
}
// Get the graveyard's ID.