Core: Codestyle cleanup
This commit is contained in:
@@ -62,7 +62,7 @@ void BattlegroundAA::AddPlayer(Player *plr)
|
||||
m_PlayerScores[plr->GetGUID()] = sc;
|
||||
}
|
||||
|
||||
void BattlegroundAA::RemovePlayer(Player * /*plr*/, uint64 /*guid*/)
|
||||
void BattlegroundAA::RemovePlayer(Player* /*plr*/, uint64 /*guid*/)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ void BattlegroundAA::HandleKillPlayer(Player* player, Player* killer)
|
||||
Battleground::HandleKillPlayer(player, killer);
|
||||
}
|
||||
|
||||
void BattlegroundAA::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
|
||||
void BattlegroundAA::HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -215,7 +215,7 @@ void BattlegroundAB::AddPlayer(Player *plr)
|
||||
m_PlayerScores[plr->GetGUID()] = sc;
|
||||
}
|
||||
|
||||
void BattlegroundAB::RemovePlayer(Player * /*plr*/, uint64 /*guid*/)
|
||||
void BattlegroundAB::RemovePlayer(Player* /*plr*/, uint64 /*guid*/)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ class BattlegroundBE : public Battleground
|
||||
virtual void Reset();
|
||||
virtual void FillInitialWorldStates(WorldPacket &d);
|
||||
void HandleKillPlayer(Player* player, Player *killer);
|
||||
bool HandlePlayerUnderMap(Player * plr);
|
||||
bool HandlePlayerUnderMap(Player* plr);
|
||||
|
||||
/* Scorekeeping */
|
||||
void UpdatePlayerScore(Player *Source, uint32 type, uint32 value, bool doAddHonor = true);
|
||||
|
||||
@@ -110,7 +110,7 @@ void BattlegroundDS::AddPlayer(Player *plr)
|
||||
UpdateArenaWorldState();
|
||||
}
|
||||
|
||||
void BattlegroundDS::RemovePlayer(Player * /*plr*/, uint64 /*guid*/)
|
||||
void BattlegroundDS::RemovePlayer(Player* /*plr*/, uint64 /*guid*/)
|
||||
{
|
||||
if (GetStatus() == STATUS_WAIT_LEAVE)
|
||||
return;
|
||||
|
||||
@@ -77,7 +77,7 @@ class BattlegroundDS : public Battleground
|
||||
virtual void Reset();
|
||||
virtual void FillInitialWorldStates(WorldPacket &d);
|
||||
void HandleKillPlayer(Player* player, Player *killer);
|
||||
bool HandlePlayerUnderMap(Player * plr);
|
||||
bool HandlePlayerUnderMap(Player* plr);
|
||||
private:
|
||||
uint32 m_waterTimer;
|
||||
bool m_waterfallActive;
|
||||
|
||||
@@ -370,7 +370,7 @@ class BattlegroundEY : public Battleground
|
||||
bool IsAllNodesConrolledByTeam(uint32 team) const;
|
||||
private:
|
||||
void EventPlayerCapturedFlag(Player *Source, uint32 BgObjectType);
|
||||
void EventPlayerCapturedFlag(Player * /*Source*/) {}
|
||||
void EventPlayerCapturedFlag(Player* /*Source*/) {}
|
||||
void EventTeamCapturedPoint(Player *Source, uint32 Point);
|
||||
void EventTeamLostPoint(Player *Source, uint32 Point);
|
||||
void UpdatePointsCount(uint32 Team);
|
||||
|
||||
@@ -316,7 +316,7 @@ void BattlegroundIC::RemovePlayer(Player* plr, uint64 /*guid*/)
|
||||
plr->RemoveAura(SPELL_OIL_REFINERY);
|
||||
}
|
||||
|
||||
void BattlegroundIC::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
|
||||
void BattlegroundIC::HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/)
|
||||
{
|
||||
// this is wrong way to implement these things. On official it done by gameobject spell cast.
|
||||
if (GetStatus() != STATUS_IN_PROGRESS)
|
||||
|
||||
@@ -69,6 +69,6 @@ class BattlegroundNA : public Battleground
|
||||
virtual void Reset();
|
||||
virtual void FillInitialWorldStates(WorldPacket &d);
|
||||
void HandleKillPlayer(Player* player, Player *killer);
|
||||
bool HandlePlayerUnderMap(Player * plr);
|
||||
bool HandlePlayerUnderMap(Player* plr);
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -61,7 +61,7 @@ void BattlegroundRB::RemovePlayer(Player* /*plr*/, uint64 /*guid*/)
|
||||
{
|
||||
}
|
||||
|
||||
void BattlegroundRB::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
|
||||
void BattlegroundRB::HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/)
|
||||
{
|
||||
// this is wrong way to implement these things. On official it done by gameobject spell cast.
|
||||
if (GetStatus() != STATUS_IN_PROGRESS)
|
||||
|
||||
@@ -65,6 +65,6 @@ class BattlegroundRL : public Battleground
|
||||
void HandleAreaTrigger(Player *Source, uint32 Trigger);
|
||||
bool SetupBattleground();
|
||||
void HandleKillPlayer(Player* player, Player *killer);
|
||||
bool HandlePlayerUnderMap(Player * plr);
|
||||
bool HandlePlayerUnderMap(Player* plr);
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -131,7 +131,7 @@ void BattlegroundRV::AddPlayer(Player *plr)
|
||||
UpdateWorldState(BG_RV_WORLD_STATE_H, GetAlivePlayersCountByTeam(HORDE));
|
||||
}
|
||||
|
||||
void BattlegroundRV::RemovePlayer(Player * /*plr*/, uint64 /*guid*/)
|
||||
void BattlegroundRV::RemovePlayer(Player* /*plr*/, uint64 /*guid*/)
|
||||
{
|
||||
if (GetStatus() == STATUS_WAIT_LEAVE)
|
||||
return;
|
||||
|
||||
@@ -122,7 +122,7 @@ class BattlegroundRV : public Battleground
|
||||
void HandleAreaTrigger(Player *Source, uint32 Trigger);
|
||||
bool SetupBattleground();
|
||||
void HandleKillPlayer(Player* player, Player *killer);
|
||||
bool HandlePlayerUnderMap(Player * plr);
|
||||
bool HandlePlayerUnderMap(Player* plr);
|
||||
|
||||
private:
|
||||
uint32 Timer;
|
||||
|
||||
@@ -469,7 +469,7 @@ void BattlegroundSA::RemovePlayer(Player* /*plr*/, uint64 /*guid*/)
|
||||
{
|
||||
}
|
||||
|
||||
void BattlegroundSA::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
|
||||
void BattlegroundSA::HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/)
|
||||
{
|
||||
// this is wrong way to implement these things. On official it done by gameobject spell cast.
|
||||
if (GetStatus() != STATUS_IN_PROGRESS)
|
||||
@@ -912,7 +912,7 @@ void BattlegroundSA::SendTransportInit(Player *player)
|
||||
}
|
||||
}
|
||||
|
||||
void BattlegroundSA::SendTransportsRemove(Player * player)
|
||||
void BattlegroundSA::SendTransportsRemove(Player* player)
|
||||
{
|
||||
if (m_BgObjects[BG_SA_BOAT_ONE] || m_BgObjects[BG_SA_BOAT_TWO])
|
||||
{
|
||||
|
||||
@@ -538,7 +538,7 @@ class BattlegroundSA : public Battleground
|
||||
/// Send packet to player for create boats (client part)
|
||||
void SendTransportInit(Player *player);
|
||||
/// Send packet to player for destroy boats (client part)
|
||||
void SendTransportsRemove(Player * player);
|
||||
void SendTransportsRemove(Player* player);
|
||||
|
||||
/// Id of attacker team
|
||||
TeamId Attackers;
|
||||
|
||||
@@ -142,20 +142,20 @@ void BattlegroundWS::Update(uint32 diff)
|
||||
m_FlagSpellForceTimer += diff;
|
||||
if (m_FlagDebuffState == 0 && m_FlagSpellForceTimer >= 600000) //10 minutes
|
||||
{
|
||||
if (Player * plr = sObjectMgr->GetPlayer(m_FlagKeepers[0]))
|
||||
if (Player* plr = sObjectMgr->GetPlayer(m_FlagKeepers[0]))
|
||||
plr->CastSpell(plr, WS_SPELL_FOCUSED_ASSAULT, true);
|
||||
if (Player * plr = sObjectMgr->GetPlayer(m_FlagKeepers[1]))
|
||||
if (Player* plr = sObjectMgr->GetPlayer(m_FlagKeepers[1]))
|
||||
plr->CastSpell(plr, WS_SPELL_FOCUSED_ASSAULT, true);
|
||||
m_FlagDebuffState = 1;
|
||||
}
|
||||
else if (m_FlagDebuffState == 1 && m_FlagSpellForceTimer >= 900000) //15 minutes
|
||||
{
|
||||
if (Player * plr = sObjectMgr->GetPlayer(m_FlagKeepers[0]))
|
||||
if (Player* plr = sObjectMgr->GetPlayer(m_FlagKeepers[0]))
|
||||
{
|
||||
plr->RemoveAurasDueToSpell(WS_SPELL_FOCUSED_ASSAULT);
|
||||
plr->CastSpell(plr, WS_SPELL_BRUTAL_ASSAULT, true);
|
||||
}
|
||||
if (Player * plr = sObjectMgr->GetPlayer(m_FlagKeepers[1]))
|
||||
if (Player* plr = sObjectMgr->GetPlayer(m_FlagKeepers[1]))
|
||||
{
|
||||
plr->RemoveAurasDueToSpell(WS_SPELL_FOCUSED_ASSAULT);
|
||||
plr->CastSpell(plr, WS_SPELL_BRUTAL_ASSAULT, true);
|
||||
|
||||
Reference in New Issue
Block a user