josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Codestyle cleanup

Browse Source
This commit is contained in:
click
2011-06-11 22:35:29 +02:00
parent 9ef8bd3072
commit 158966dc79
410 changed files with 1790 additions and 1790 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
+6 -6
View File
@@ -302,7 +302,7 @@ void OPvPCapturePointEP_NPT::SummonGO(uint32 team)
m_SummonedGOSide = team;
DelObject(EP_NPT_BUFF);
AddObject(EP_NPT_BUFF, EP_NPT_LordaeronShrine.entry, EP_NPT_LordaeronShrine.map, EP_NPT_LordaeronShrine.x, EP_NPT_LordaeronShrine.y, EP_NPT_LordaeronShrine.z, EP_NPT_LordaeronShrine.o, EP_NPT_LordaeronShrine.rot0, EP_NPT_LordaeronShrine.rot1, EP_NPT_LordaeronShrine.rot2, EP_NPT_LordaeronShrine.rot3);
GameObject * go = HashMapHolder<GameObject>::Find(m_Objects[EP_NPT_BUFF]);
GameObject* go = HashMapHolder<GameObject>::Find(m_Objects[EP_NPT_BUFF]);
if (go)
go->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 84 : 83));
}
@@ -576,7 +576,7 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team)
/*
// sky - we need update gso code
Creature * c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]);
Creature* c = HashMapHolder<Creature>::Find(m_Creatures[EP_PWT_FLIGHTMASTER]);
//Spawn flight master as friendly to capturing team
c->SetUInt32Value(GAMEOBJECT_FACTION, (team == ALLIANCE ? 55 : 68));
if(c)
@@ -658,7 +658,7 @@ bool OutdoorPvPEP::Update(uint32 diff)
return false;
}
void OutdoorPvPEP::HandlePlayerEnterZone(Player * plr, uint32 zone)
void OutdoorPvPEP::HandlePlayerEnterZone(Player* plr, uint32 zone)
{
// add buffs
if (plr->GetTeam() == ALLIANCE)
@@ -674,7 +674,7 @@ void OutdoorPvPEP::HandlePlayerEnterZone(Player * plr, uint32 zone)
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
}
void OutdoorPvPEP::HandlePlayerLeaveZone(Player * plr, uint32 zone)
void OutdoorPvPEP::HandlePlayerLeaveZone(Player* plr, uint32 zone)
{
// remove buffs
if (plr->GetTeam() == ALLIANCE)
@@ -694,7 +694,7 @@ void OutdoorPvPEP::BuffTeams()
{
for (PlayerSet::iterator itr = m_players[0].begin(); itr != m_players[0].end(); ++itr)
{
Player * plr = *itr;
Player* plr = *itr;
{
for (int i = 0; i < 4; ++i)
plr->RemoveAurasDueToSpell(EP_AllianceBuffs[i]);
@@ -704,7 +704,7 @@ void OutdoorPvPEP::BuffTeams()
}
for (PlayerSet::iterator itr = m_players[1].begin(); itr != m_players[1].end(); ++itr)
{
Player * plr = *itr;
Player* plr = *itr;
{
for (int i = 0; i < 4; ++i)
plr->RemoveAurasDueToSpell(EP_HordeBuffs[i]);
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
+9 -9
View File
@@ -197,8 +197,8 @@ class OPvPCapturePointEP_EWT : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player * plr);
void HandlePlayerLeave(Player * plr);
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
protected:
@@ -228,8 +228,8 @@ class OPvPCapturePointEP_NPT : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player * plr);
void HandlePlayerLeave(Player * plr);
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
protected:
@@ -259,8 +259,8 @@ class OPvPCapturePointEP_CGT : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player * plr);
void HandlePlayerLeave(Player * plr);
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
protected:
@@ -290,8 +290,8 @@ class OPvPCapturePointEP_PWT : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player * plr);
void HandlePlayerLeave(Player * plr);
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
protected:
@@ -326,7 +326,7 @@ class OutdoorPvPEP : public OutdoorPvP
void FillInitialWorldStates(WorldPacket &data);
void SendRemoveWorldStates(Player * plr);
void SendRemoveWorldStates(Player* plr);
void BuffTeams();
src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
+3 -3
View File
@@ -81,7 +81,7 @@ bool OutdoorPvPHP::SetupOutdoorPvP()
return true;
}
void OutdoorPvPHP::HandlePlayerEnterZone(Player * plr, uint32 zone)
void OutdoorPvPHP::HandlePlayerEnterZone(Player* plr, uint32 zone)
{
// add buffs
if (plr->GetTeam() == ALLIANCE)
@@ -97,7 +97,7 @@ void OutdoorPvPHP::HandlePlayerEnterZone(Player * plr, uint32 zone)
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
}
void OutdoorPvPHP::HandlePlayerLeaveZone(Player * plr, uint32 zone)
void OutdoorPvPHP::HandlePlayerLeaveZone(Player* plr, uint32 zone)
{
// remove buffs
if (plr->GetTeam() == ALLIANCE)
@@ -320,7 +320,7 @@ void OPvPCapturePointHP::HandlePlayerLeave(Player *plr)
OPvPCapturePoint::HandlePlayerLeave(plr);
}
void OutdoorPvPHP::HandleKillImpl(Player *plr, Unit * killed)
void OutdoorPvPHP::HandleKillImpl(Player *plr, Unit* killed)
{
if (killed->GetTypeId() != TYPEID_PLAYER)
return;
src/server/scripts/OutdoorPvP/OutdoorPvPHP.h
+4 -4
View File
@@ -98,8 +98,8 @@ class OPvPCapturePointHP : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player * plr);
void HandlePlayerLeave(Player * plr);
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
private:
@@ -123,9 +123,9 @@ class OutdoorPvPHP : public OutdoorPvP
void FillInitialWorldStates(WorldPacket &data);
void SendRemoveWorldStates(Player * plr);
void SendRemoveWorldStates(Player* plr);
void HandleKillImpl(Player * plr, Unit * killed);
void HandleKillImpl(Player* plr, Unit* killed);
private:
src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
+6 -6
View File
@@ -29,7 +29,7 @@ OutdoorPvPNA::OutdoorPvPNA()
m_TypeId = OUTDOOR_PVP_NA;
}
void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit * killed)
void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit* killed)
{
if (killed->GetTypeId() == TYPEID_PLAYER && plr->GetTeam() != killed->ToPlayer()->GetTeam())
{
@@ -64,12 +64,12 @@ uint32 OPvPCapturePointNA::GetAliveGuardsCount()
case NA_NPC_GUARD_14:
case NA_NPC_GUARD_15:
{
if (Creature * cr = HashMapHolder<Creature>::Find(itr->second))
if (Creature* cr = HashMapHolder<Creature>::Find(itr->second))
{
if (cr->isAlive())
++cnt;
}
else if (CreatureData const * cd = sObjectMgr->GetCreatureData(GUID_LOPART(itr->second)))
else if (CreatureData const* cd = sObjectMgr->GetCreatureData(GUID_LOPART(itr->second)))
{
if (!cd->is_dead)
++cnt;
@@ -225,7 +225,7 @@ bool OutdoorPvPNA::SetupOutdoorPvP()
return true;
}
void OutdoorPvPNA::HandlePlayerEnterZone(Player * plr, uint32 zone)
void OutdoorPvPNA::HandlePlayerEnterZone(Player* plr, uint32 zone)
{
// add buffs
if (plr->GetTeam() == m_obj->m_ControllingFaction)
@@ -233,7 +233,7 @@ void OutdoorPvPNA::HandlePlayerEnterZone(Player * plr, uint32 zone)
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
}
void OutdoorPvPNA::HandlePlayerLeaveZone(Player * plr, uint32 zone)
void OutdoorPvPNA::HandlePlayerLeaveZone(Player* plr, uint32 zone)
{
// remove buffs
plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF);
@@ -334,7 +334,7 @@ bool OutdoorPvPNA::Update(uint32 diff)
return m_obj->Update(diff);
}
bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObject * /*go*/)
bool OPvPCapturePointNA::HandleCustomSpell(Player* plr, uint32 spellId, GameObject* /*go*/)
{
std::vector<uint32> nodes;
nodes.resize(2);
src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
+5 -5
View File
@@ -267,10 +267,10 @@ class OPvPCapturePointNA : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player * plr);
void HandlePlayerLeave(Player * plr);
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go);
bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject* go);
int32 HandleOpenGo(Player *plr, uint64 guid);
@@ -327,9 +327,9 @@ class OutdoorPvPNA : public OutdoorPvP
void FillInitialWorldStates(WorldPacket &data);
void SendRemoveWorldStates(Player * plr);
void SendRemoveWorldStates(Player* plr);
void HandleKillImpl(Player * plr, Unit * killed);
void HandleKillImpl(Player* plr, Unit* killed);
private:
src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
+4 -4
View File
@@ -67,14 +67,14 @@ bool OutdoorPvPSI::Update(uint32 /*diff*/)
return false;
}
void OutdoorPvPSI::HandlePlayerEnterZone(Player * plr, uint32 zone)
void OutdoorPvPSI::HandlePlayerEnterZone(Player* plr, uint32 zone)
{
if (plr->GetTeam() == m_LastController)
plr->CastSpell(plr, SI_CENARION_FAVOR, true);
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
}
void OutdoorPvPSI::HandlePlayerLeaveZone(Player * plr, uint32 zone)
void OutdoorPvPSI::HandlePlayerLeaveZone(Player* plr, uint32 zone)
{
// remove buffs
plr->RemoveAurasDueToSpell(SI_CENARION_FAVOR);
@@ -155,7 +155,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius)
{
// he dropped it further, summon mound
GameObject * go = new GameObject;
GameObject* go = new GameObject;
Map * map = plr->GetMap();
if (!map)
{
@@ -185,7 +185,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
if (plr->GetDistance(atEntry->x, atEntry->y, atEntry->z) > 5.0f + atEntry->radius)
{
// he dropped it further, summon mound
GameObject * go = new GameObject;
GameObject* go = new GameObject;
Map * map = plr->GetMap();
if (!map)
{
src/server/scripts/OutdoorPvP/OutdoorPvPSI.h
+4 -4
View File
@@ -66,13 +66,13 @@ class OutdoorPvPSI : public OutdoorPvP
void FillInitialWorldStates(WorldPacket &data);
void SendRemoveWorldStates(Player * plr);
void SendRemoveWorldStates(Player* plr);
bool HandleAreaTrigger(Player * plr, uint32 trigger);
bool HandleAreaTrigger(Player* plr, uint32 trigger);
bool HandleDropFlag(Player * plr, uint32 spellId);
bool HandleDropFlag(Player* plr, uint32 spellId);
bool HandleCustomSpell(Player * plr, uint32 spellId, GameObject *go);
bool HandleCustomSpell(Player* plr, uint32 spellId, GameObject *go);
void UpdateWorldState();
src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
+3 -3
View File
@@ -67,7 +67,7 @@ void OutdoorPvPTF::FillInitialWorldStates(WorldPacket &data)
}
}
void OutdoorPvPTF::SendRemoveWorldStates(Player * plr)
void OutdoorPvPTF::SendRemoveWorldStates(Player* plr)
{
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS, uint32(0));
plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N, uint32(0));
@@ -186,7 +186,7 @@ bool OutdoorPvPTF::Update(uint32 diff)
return changed;
}
void OutdoorPvPTF::HandlePlayerEnterZone(Player * plr, uint32 zone)
void OutdoorPvPTF::HandlePlayerEnterZone(Player* plr, uint32 zone)
{
if (plr->GetTeam() == ALLIANCE)
{
@@ -201,7 +201,7 @@ void OutdoorPvPTF::HandlePlayerEnterZone(Player * plr, uint32 zone)
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
}
void OutdoorPvPTF::HandlePlayerLeaveZone(Player * plr, uint32 zone)
void OutdoorPvPTF::HandlePlayerLeaveZone(Player* plr, uint32 zone)
{
// remove buffs
plr->RemoveAurasDueToSpell(TF_CAPTURE_BUFF);
src/server/scripts/OutdoorPvP/OutdoorPvPTF.h
+3 -3
View File
@@ -136,8 +136,8 @@ class OPvPCapturePointTF : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player * plr);
void HandlePlayerLeave(Player * plr);
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
void UpdateTowerState();
@@ -165,7 +165,7 @@ class OutdoorPvPTF : public OutdoorPvP
void FillInitialWorldStates(WorldPacket &data);
void SendRemoveWorldStates(Player * plr);
void SendRemoveWorldStates(Player* plr);
private:
src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
+7 -7
View File
@@ -139,7 +139,7 @@ bool OutdoorPvPZM::Update(uint32 diff)
return changed;
}
void OutdoorPvPZM::HandlePlayerEnterZone(Player * plr, uint32 zone)
void OutdoorPvPZM::HandlePlayerEnterZone(Player* plr, uint32 zone)
{
if (plr->GetTeam() == ALLIANCE)
{
@@ -154,7 +154,7 @@ void OutdoorPvPZM::HandlePlayerEnterZone(Player * plr, uint32 zone)
OutdoorPvP::HandlePlayerEnterZone(plr, zone);
}
void OutdoorPvPZM::HandlePlayerLeaveZone(Player * plr, uint32 zone)
void OutdoorPvPZM::HandlePlayerLeaveZone(Player* plr, uint32 zone)
{
// remove buffs
plr->RemoveAurasDueToSpell(ZM_CAPTURE_BUFF);
@@ -190,7 +190,7 @@ bool OutdoorPvPZM::SetupOutdoorPvP()
return true;
}
void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit * killed)
void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit* killed)
{
if (killed->GetTypeId() != TYPEID_PLAYER)
return;
@@ -311,7 +311,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction)
if (m_FlagCarrierGUID)
{
// remove flag from carrier, reset flag carrier guid
Player * p = sObjectMgr->GetPlayer(m_FlagCarrierGUID);
Player* p = sObjectMgr->GetPlayer(m_FlagCarrierGUID);
if (p)
{
p->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A);
@@ -326,7 +326,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction)
UpdateTowerState();
}
bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipMenuItems const& /*gso*/)
bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& /*gso*/)
{
uint64 guid = c->GetGUID();
std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid);
@@ -345,7 +345,7 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid,
std::map<uint64, uint32>::iterator itr = m_CreatureTypes.find(guid);
if (itr != m_CreatureTypes.end())
{
Creature * cr = HashMapHolder<Creature>::Find(guid);
Creature* cr = HashMapHolder<Creature>::Find(guid);
if (!cr)
return true;
// if the flag is already taken, then return
@@ -368,7 +368,7 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid,
return false;
}
bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player * /*plr*/, uint32 spellId)
bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player* /*plr*/, uint32 spellId)
{
switch(spellId)
{
src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
+7 -7
View File
@@ -181,8 +181,8 @@ class OPvPCapturePointZM_Beacon : public OPvPCapturePoint
void FillInitialWorldStates(WorldPacket & data);
// used when player is activated/inactivated in the area
bool HandlePlayerEnter(Player * plr);
void HandlePlayerLeave(Player * plr);
bool HandlePlayerEnter(Player* plr);
void HandlePlayerLeave(Player* plr);
void UpdateTowerState();
@@ -219,11 +219,11 @@ class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint
void SetBeaconState(uint32 controlling_team); // not good atm
bool HandleGossipOption(Player * plr, uint64 guid, uint32 gossipid);
bool HandleGossipOption(Player* plr, uint64 guid, uint32 gossipid);
bool HandleDropFlag(Player * plr, uint32 spellId);
bool HandleDropFlag(Player* plr, uint32 spellId);
bool CanTalkTo(Player * plr, Creature * c, GossipMenuItems const& gso);
bool CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& gso);
private:
@@ -253,9 +253,9 @@ class OutdoorPvPZM : public OutdoorPvP
void FillInitialWorldStates(WorldPacket &data);
void SendRemoveWorldStates(Player * plr);
void SendRemoveWorldStates(Player* plr);
void HandleKillImpl(Player * plr, Unit * killed);
void HandleKillImpl(Player* plr, Unit* killed);
private: