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/game/OutdoorPvP/OutdoorPvP.cpp
+14 -14
View File
@@ -36,7 +36,7 @@ m_State(OBJECTIVESTATE_NEUTRAL), m_neutralValuePct(0), m_PvP(pvp)
{
}
bool OPvPCapturePoint::HandlePlayerEnter(Player * plr)
bool OPvPCapturePoint::HandlePlayerEnter(Player* plr)
{
if (m_capturePoint)
{
@@ -47,7 +47,7 @@ bool OPvPCapturePoint::HandlePlayerEnter(Player * plr)
return m_activePlayers[plr->GetTeamId()].insert(plr).second;
}
void OPvPCapturePoint::HandlePlayerLeave(Player * plr)
void OPvPCapturePoint::HandlePlayerLeave(Player* plr)
{
if (m_capturePoint)
plr->SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldState1, 0);
@@ -239,12 +239,12 @@ OutdoorPvP::~OutdoorPvP()
DeleteSpawns();
}
void OutdoorPvP::HandlePlayerEnterZone(Player * plr, uint32 /*zone*/)
void OutdoorPvP::HandlePlayerEnterZone(Player* plr, uint32 /*zone*/)
{
m_players[plr->GetTeamId()].insert(plr);
}
void OutdoorPvP::HandlePlayerLeaveZone(Player * plr, uint32 /*zone*/)
void OutdoorPvP::HandlePlayerLeaveZone(Player* plr, uint32 /*zone*/)
{
// inform the objectives of the leaving
for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
@@ -256,7 +256,7 @@ void OutdoorPvP::HandlePlayerLeaveZone(Player * plr, uint32 /*zone*/)
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Player %s left an outdoorpvp zone", plr->GetName());
}
void OutdoorPvP::HandlePlayerResurrects(Player * /*plr*/, uint32 /*zone*/)
void OutdoorPvP::HandlePlayerResurrects(Player* /*plr*/, uint32 /*zone*/)
{
}
@@ -430,7 +430,7 @@ void OPvPCapturePoint::SendObjectiveComplete(uint32 id, uint64 guid)
(*itr)->KilledMonsterCredit(id, guid);
}
void OutdoorPvP::HandleKill(Player *killer, Unit * killed)
void OutdoorPvP::HandleKill(Player *killer, Unit* killed)
{
if (Group * pGroup = killer->GetGroup())
{
@@ -477,7 +477,7 @@ bool OPvPCapturePoint::IsInsideObjective(Player *plr) const
return m_activePlayers[plr->GetTeamId()].find(plr) != m_activePlayers[plr->GetTeamId()].end();
}
bool OutdoorPvP::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go)
bool OutdoorPvP::HandleCustomSpell(Player *plr, uint32 spellId, GameObject* go)
{
for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
if (itr->second->HandleCustomSpell(plr, spellId, go))
@@ -486,7 +486,7 @@ bool OutdoorPvP::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go)
return false;
}
bool OPvPCapturePoint::HandleCustomSpell(Player *plr, uint32 /*spellId*/, GameObject * /*go*/)
bool OPvPCapturePoint::HandleCustomSpell(Player *plr, uint32 /*spellId*/, GameObject* /*go*/)
{
if (!plr->IsOutdoorPvPActive())
return false;
@@ -502,7 +502,7 @@ bool OutdoorPvP::HandleOpenGo(Player *plr, uint64 guid)
return false;
}
bool OutdoorPvP::HandleGossipOption(Player * plr, uint64 guid, uint32 id)
bool OutdoorPvP::HandleGossipOption(Player* plr, uint64 guid, uint32 id)
{
for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
if (itr->second->HandleGossipOption(plr, guid, id))
@@ -520,7 +520,7 @@ bool OutdoorPvP::CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& gso)
return false;
}
bool OutdoorPvP::HandleDropFlag(Player * plr, uint32 id)
bool OutdoorPvP::HandleDropFlag(Player* plr, uint32 id)
{
for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
if (itr->second->HandleDropFlag(plr, id))
@@ -529,7 +529,7 @@ bool OutdoorPvP::HandleDropFlag(Player * plr, uint32 id)
return false;
}
bool OPvPCapturePoint::HandleGossipOption(Player * /*plr*/, uint64 /*guid*/, uint32 /*id*/)
bool OPvPCapturePoint::HandleGossipOption(Player* /*plr*/, uint64 /*guid*/, uint32 /*id*/)
{
return false;
}
@@ -539,12 +539,12 @@ bool OPvPCapturePoint::CanTalkTo(Player* /*plr*/, Creature* /*c*/, GossipMenuIte
return false;
}
bool OPvPCapturePoint::HandleDropFlag(Player * /*plr*/, uint32 /*id*/)
bool OPvPCapturePoint::HandleDropFlag(Player* /*plr*/, uint32 /*id*/)
{
return false;
}
int32 OPvPCapturePoint::HandleOpenGo(Player * /*plr*/, uint64 guid)
int32 OPvPCapturePoint::HandleOpenGo(Player* /*plr*/, uint64 guid)
{
std::map<uint64, uint32>::iterator itr = m_ObjectTypes.find(guid);
if (itr != m_ObjectTypes.end())
@@ -554,7 +554,7 @@ int32 OPvPCapturePoint::HandleOpenGo(Player * /*plr*/, uint64 guid)
return -1;
}
bool OutdoorPvP::HandleAreaTrigger(Player * /*plr*/, uint32 /*trigger*/)
bool OutdoorPvP::HandleAreaTrigger(Player* /*plr*/, uint32 /*trigger*/)
{
return false;
}
src/server/game/OutdoorPvP/OutdoorPvP.h
+16 -16
View File
@@ -104,13 +104,13 @@ class OPvPCapturePoint
void SendObjectiveComplete(uint32 id, uint64 guid);
// used when player is activated/inactivated in the area
virtual bool HandlePlayerEnter(Player * plr);
virtual void HandlePlayerLeave(Player * plr);
virtual bool HandlePlayerEnter(Player* plr);
virtual void HandlePlayerLeave(Player* plr);
// checks if player is in range of a capture credit marker
bool IsInsideObjective(Player * plr) const;
bool IsInsideObjective(Player* plr) const;
virtual bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go);
virtual bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject* go);
virtual int32 HandleOpenGo(Player *plr, uint64 guid);
@@ -127,7 +127,7 @@ class OPvPCapturePoint
virtual bool CanTalkTo(Player* plr, Creature* c, GossipMenuItems const& gso);
virtual bool HandleDropFlag(Player * plr, uint32 spellId);
virtual bool HandleDropFlag(Player* plr, uint32 spellId);
virtual void DeleteSpawns();
@@ -208,10 +208,10 @@ class OutdoorPvP : public ZoneScript
virtual void FillInitialWorldStates(WorldPacket & /*data*/) {}
// called when a player triggers an areatrigger
virtual bool HandleAreaTrigger(Player * plr, uint32 trigger);
virtual bool HandleAreaTrigger(Player* plr, uint32 trigger);
// called on custom spell
virtual bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go);
virtual bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject* go);
// called on go use
virtual bool HandleOpenGo(Player *plr, uint64 guid);
@@ -230,18 +230,18 @@ class OutdoorPvP : public ZoneScript
virtual bool Update(uint32 diff);
// handle npc/player kill
virtual void HandleKill(Player * killer, Unit * killed);
virtual void HandleKillImpl(Player * /*killer*/, Unit * /*killed*/) {}
virtual void HandleKill(Player* killer, Unit* killed);
virtual void HandleKillImpl(Player* /*killer*/, Unit* /*killed*/) {}
// checks if player is in range of a capture credit marker
bool IsInsideObjective(Player * plr) const;
bool IsInsideObjective(Player* plr) const;
// awards rewards for player kill
virtual void AwardKillBonus(Player * /*plr*/) {}
virtual void AwardKillBonus(Player* /*plr*/) {}
uint32 GetTypeId() {return m_TypeId;}
virtual bool HandleDropFlag(Player * plr, uint32 spellId);
virtual bool HandleDropFlag(Player* plr, uint32 spellId);
virtual bool HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid);
@@ -261,14 +261,14 @@ class OutdoorPvP : public ZoneScript
bool m_sendUpdate;
// world state stuff
virtual void SendRemoveWorldStates(Player * /*plr*/) {}
virtual void SendRemoveWorldStates(Player* /*plr*/) {}
void BroadcastPacket(WorldPacket & data) const;
virtual void HandlePlayerEnterZone(Player * plr, uint32 zone);
virtual void HandlePlayerLeaveZone(Player * plr, uint32 zone);
virtual void HandlePlayerEnterZone(Player* plr, uint32 zone);
virtual void HandlePlayerLeaveZone(Player* plr, uint32 zone);
virtual void HandlePlayerResurrects(Player * plr, uint32 zone);
virtual void HandlePlayerResurrects(Player* plr, uint32 zone);
void AddCapturePoint(OPvPCapturePoint* cp)
{
src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
+1 -1
View File
@@ -164,7 +164,7 @@ void OutdoorPvPMgr::Update(uint32 diff)
}
}
bool OutdoorPvPMgr::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go)
bool OutdoorPvPMgr::HandleCustomSpell(Player *plr, uint32 spellId, GameObject* go)
{
for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
{
src/server/game/OutdoorPvP/OutdoorPvPMgr.h
+7 -7
View File
@@ -50,22 +50,22 @@ class OutdoorPvPMgr
void InitOutdoorPvP();
// called when a player enters an outdoor pvp area
void HandlePlayerEnterZone(Player * plr, uint32 areaflag);
void HandlePlayerEnterZone(Player* plr, uint32 areaflag);
// called when player leaves an outdoor pvp area
void HandlePlayerLeaveZone(Player * plr, uint32 areaflag);
void HandlePlayerLeaveZone(Player* plr, uint32 areaflag);
// called when player resurrects
void HandlePlayerResurrects(Player * plr, uint32 areaflag);
void HandlePlayerResurrects(Player* plr, uint32 areaflag);
// return assigned outdoor pvp
OutdoorPvP * GetOutdoorPvPToZoneId(uint32 zoneid);
// handle custom (non-exist in dbc) spell if registered
bool HandleCustomSpell(Player * plr, uint32 spellId, GameObject* go);
bool HandleCustomSpell(Player* plr, uint32 spellId, GameObject* go);
// handle custom go if registered
bool HandleOpenGo(Player * plr, uint64 guid);
bool HandleOpenGo(Player* plr, uint64 guid);
ZoneScript * GetZoneScript(uint32 zoneId);
@@ -73,11 +73,11 @@ class OutdoorPvPMgr
void Update(uint32 diff);
void HandleGossipOption(Player * player, uint64 guid, uint32 gossipid);
void HandleGossipOption(Player* player, uint64 guid, uint32 gossipid);
bool CanTalkTo(Player* player, Creature* creature, GossipMenuItems const& gso);
void HandleDropFlag(Player * plr, uint32 spellId);
void HandleDropFlag(Player* plr, uint32 spellId);
typedef std::vector<OutdoorPvP*> OutdoorPvPSet;
typedef std::map<uint32 /* zoneid */, OutdoorPvP*> OutdoorPvPMap;