aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Battlegrounds/Battleground.h2
-rw-r--r--src/server/game/Entities/Player/Player.cpp9
-rw-r--r--src/server/game/Entities/Player/Player.h1
-rw-r--r--src/server/game/Miscellaneous/SharedDefines.h6
-rw-r--r--src/server/game/Spells/Auras/SpellAuraDefines.h6
-rw-r--r--src/server/game/Spells/Auras/SpellAuraEffects.cpp13
-rw-r--r--src/server/game/Spells/Auras/SpellAuraEffects.h1
7 files changed, 6 insertions, 32 deletions
diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h
index c0dffbdea24..5bbb0eeeca8 100644
--- a/src/server/game/Battlegrounds/Battleground.h
+++ b/src/server/game/Battlegrounds/Battleground.h
@@ -120,6 +120,8 @@ enum BattlegroundSpells
SPELL_AURA_PLAYER_INACTIVE = 43681, // Inactive
SPELL_HONORABLE_DEFENDER_25Y = 68652, // +50% honor when standing at a capture point that you control, 25yards radius (added in 3.2)
SPELL_HONORABLE_DEFENDER_60Y = 66157, // +50% honor when standing at a capture point that you control, 60yards radius (added in 3.2), probably for 40+ player battlegrounds
+ SPELL_MERCENARY_CONTRACT_HORDE = 193472,
+ SPELL_MERCENARY_CONTRACT_ALLIANCE = 193475,
SPELL_MERCENARY_HORDE_1 = 193864,
SPELL_MERCENARY_HORDE_REACTIONS = 195838,
SPELL_MERCENARY_ALLIANCE_1 = 193863,
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index c860dedbd28..e309571b936 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -6285,15 +6285,6 @@ TeamId Player::TeamIdForRace(uint8 race)
return TEAM_NEUTRAL;
}
-void Player::SwitchToOppositeTeam(bool /*apply*/)
-{
- // TODO: remove
- //m_team = TeamForRace(GetRace());
-
- //if (apply)
- // m_team = (m_team == ALLIANCE) ? HORDE : ALLIANCE;
-}
-
void Player::SetFactionForRace(uint8 race)
{
m_team = TeamForRace(race);
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 7cdcf65b62f..ec63651d666 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2210,7 +2210,6 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
static uint32 TeamForRace(uint8 race);
static TeamId TeamIdForRace(uint8 race);
uint32 GetTeam() const { return m_team; }
- void SwitchToOppositeTeam(bool apply);
TeamId GetTeamId() const { return m_team == ALLIANCE ? TEAM_ALLIANCE : TEAM_HORDE; }
void SetFactionForRace(uint8 race);
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 68d337e64ff..06f16134272 100644
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -7848,10 +7848,4 @@ enum WorldState : uint32
WS_GUILD_WEEKLY_RESET_TIME = 20050, // Next guild week reset time
};
-enum SpecialSpells : uint32
-{
- SPELL_MERCENARY_CONTRACT_HORDE = 193472,
- SPELL_MERCENARY_CONTRACT_ALLIANCE = 193475,
-};
-
#endif
diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h
index 7ec70366e36..90c3f3ebc45 100644
--- a/src/server/game/Spells/Auras/SpellAuraDefines.h
+++ b/src/server/game/Spells/Auras/SpellAuraDefines.h
@@ -580,9 +580,9 @@ enum AuraType : uint32
SPELL_AURA_486 = 486,
SPELL_AURA_COSMETIC_MOUNTED = 487,
SPELL_AURA_488 = 488,
- SPELL_AURA_MOD_ALTERNATIVE_DEFAULT_LANGUAGE = 489, // NYI
- SPELL_AURA_SWITCH_TEAM = 490,
- SPELL_AURA_491 = 491, // NYI
+ SPELL_AURA_MOD_ALTERNATIVE_DEFAULT_LANGUAGE = 489,
+ SPELL_AURA_490 = 490,
+ SPELL_AURA_491 = 491,
SPELL_AURA_492 = 492,
SPELL_AURA_493 = 493, // 1 spell, 267116 - Animal Companion (modifies Call Pet)
SPELL_AURA_SET_POWER_POINT_CHARGE = 494, // NYI
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 0b3028877db..b0db254c6b1 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -556,7 +556,7 @@ NonDefaultConstructible<pAuraEffectHandler> AuraEffectHandler[TOTAL_AURAS]=
&AuraEffect::HandleCosmeticMounted, //487 SPELL_AURA_COSMETIC_MOUNTED
&AuraEffect::HandleNULL, //488
&AuraEffect::HandleNULL, //489 SPELL_AURA_MOD_ALTERNATIVE_DEFAULT_LANGUAGE
- &AuraEffect::HandleSwitchTeam, //490 SPELL_AURA_SWITCH_TEAM
+ &AuraEffect::HandleNULL, //490
&AuraEffect::HandleNULL, //491
&AuraEffect::HandleNULL, //492
&AuraEffect::HandleNULL, //493
@@ -6011,17 +6011,6 @@ void AuraEffect::HandleLinkedSummon(AuraApplication const* aurApp, uint8 mode, b
}
}
-void AuraEffect::HandleSwitchTeam(AuraApplication const* aurApp, uint8 mode, bool apply) const
-{
- if (!(mode & AURA_EFFECT_HANDLE_REAL))
- return;
-
- Unit* target = aurApp->GetTarget();
-
- if (Player* player = target->ToPlayer())
- player->SwitchToOppositeTeam(apply);
-}
-
void AuraEffect::HandleSetFFAPvP(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const
{
if (!(mode & AURA_EFFECT_HANDLE_REAL))
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.h b/src/server/game/Spells/Auras/SpellAuraEffects.h
index 0ba6283c94b..8ed3ef13e41 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.h
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.h
@@ -317,7 +317,6 @@ class TC_GAME_API AuraEffect
void HandlePlayScene(AuraApplication const* aurApp, uint8 mode, bool apply) const;
void HandleCreateAreaTrigger(AuraApplication const* aurApp, uint8 mode, bool apply) const;
void HandleLinkedSummon(AuraApplication const* aurApp, uint8 mode, bool apply) const;
- void HandleSwitchTeam(AuraApplication const* aurApp, uint8 mode, bool apply) const;
void HandleSetFFAPvP(AuraApplication const* aurApp, uint8 mode, bool apply) const;
void HandleModOverrideZonePVPType(AuraApplication const* aurApp, uint8 mode, bool apply) const;
void HandleBattlegroundPlayerPosition(AuraApplication const* aurApp, uint8 mode, bool apply) const;