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

Add spaces after commas

Browse Source
This commit is contained in:
leak
2011-04-29 20:47:02 +02:00
parent 01a79947d5
commit 1003f30448
645 changed files with 9439 additions and 9439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/OutdoorPvP/OutdoorPvP.cpp
+10 -10
View File
@@ -144,7 +144,7 @@ bool OPvPCapturePoint::DelCreature(uint32 type)
{
if (!m_Creatures[type])
{
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "opvp creature type %u was already deleted",type);
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "opvp creature type %u was already deleted", type);
return false;
}
@@ -155,7 +155,7 @@ bool OPvPCapturePoint::DelCreature(uint32 type)
m_Creatures[type] = 0;
return false;
}
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "deleting opvp creature type %u",type);
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "deleting opvp creature type %u", type);
uint32 guid = cr->GetDBTableGUIDLow();
// Don't save respawn time
cr->SetRespawnTime(0);
@@ -164,7 +164,7 @@ bool OPvPCapturePoint::DelCreature(uint32 type)
// beats me why this is needed, but with the recent removal "cleanup" some creatures stay in the map if "properly" deleted
// so this is a big fat workaround, if AddObjectToRemoveList and DoDelayedMovesAndRemoves worked correctly, this wouldn't be needed
//if (Map * map = sMapMgr->FindMap(cr->GetMapId()))
// map->Remove(cr,false);
// map->Remove(cr, false);
// delete respawn time for this creature
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_CREATURE_RESPAWN_BY_GUID);
stmt->setUInt32(0, guid);
@@ -213,9 +213,9 @@ bool OPvPCapturePoint::DelCapturePoint()
void OPvPCapturePoint::DeleteSpawns()
{
for (std::map<uint32,uint64>::iterator i = m_Objects.begin(); i != m_Objects.end(); ++i)
for (std::map<uint32, uint64>::iterator i = m_Objects.begin(); i != m_Objects.end(); ++i)
DelObject(i->first);
for (std::map<uint32,uint64>::iterator i = m_Creatures.begin(); i != m_Creatures.end(); ++i)
for (std::map<uint32, uint64>::iterator i = m_Creatures.begin(); i != m_Creatures.end(); ++i)
DelCreature(i->first);
DelCapturePoint();
}
@@ -405,12 +405,12 @@ void OPvPCapturePoint::SendUpdateWorldState(uint32 field, uint32 value)
// send to all players present in the area
for (PlayerSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end(); ++itr)
{
(*itr)->SendUpdateWorldState(field,value);
(*itr)->SendUpdateWorldState(field, value);
}
}
}
void OPvPCapturePoint::SendObjectiveComplete(uint32 id,uint64 guid)
void OPvPCapturePoint::SendObjectiveComplete(uint32 id, uint64 guid)
{
uint32 team;
switch(m_State)
@@ -480,7 +480,7 @@ bool OPvPCapturePoint::IsInsideObjective(Player *plr) const
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))
if (itr->second->HandleCustomSpell(plr, spellId, go))
return true;
return false;
@@ -496,7 +496,7 @@ bool OPvPCapturePoint::HandleCustomSpell(Player *plr, uint32 /*spellId*/, GameOb
bool OutdoorPvP::HandleOpenGo(Player *plr, uint64 guid)
{
for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
if (itr->second->HandleOpenGo(plr,guid) >= 0)
if (itr->second->HandleOpenGo(plr, guid) >= 0)
return true;
return false;
@@ -546,7 +546,7 @@ bool OPvPCapturePoint::HandleDropFlag(Player * /*plr*/, uint32 /*id*/)
int32 OPvPCapturePoint::HandleOpenGo(Player * /*plr*/, uint64 guid)
{
std::map<uint64,uint32>::iterator itr = m_ObjectTypes.find(guid);
std::map<uint64, uint32>::iterator itr = m_ObjectTypes.find(guid);
if (itr != m_ObjectTypes.end())
{
return itr->second;
src/server/game/OutdoorPvP/OutdoorPvP.h
+4 -4
View File
@@ -179,10 +179,10 @@ class OPvPCapturePoint
// map to store the various gameobjects and creatures spawned by the objective
// type , guid
std::map<uint32,uint64> m_Objects;
std::map<uint32,uint64> m_Creatures;
std::map<uint64,uint32> m_ObjectTypes;
std::map<uint64,uint32> m_CreatureTypes;
std::map<uint32, uint64> m_Objects;
std::map<uint32, uint64> m_Creatures;
std::map<uint64, uint32> m_ObjectTypes;
std::map<uint64, uint32> m_CreatureTypes;
};
// base class for specific outdoor pvp handlers
src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
+6 -6
View File
@@ -139,7 +139,7 @@ void OutdoorPvPMgr::HandlePlayerLeaveZone(Player *plr, uint32 zoneid)
return;
itr->second->HandlePlayerLeaveZone(plr, zoneid);
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Player %u left outdoorpvp id %u",plr->GetGUIDLow(), itr->second->GetTypeId());
sLog->outDebug(LOG_FILTER_OUTDOORPVP, "Player %u left outdoorpvp id %u", plr->GetGUIDLow(), itr->second->GetTypeId());
}
OutdoorPvP * OutdoorPvPMgr::GetOutdoorPvPToZoneId(uint32 zoneid)
@@ -168,7 +168,7 @@ bool OutdoorPvPMgr::HandleCustomSpell(Player *plr, uint32 spellId, GameObject *
{
for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
{
if ((*itr)->HandleCustomSpell(plr,spellId,go))
if ((*itr)->HandleCustomSpell(plr, spellId, go))
return true;
}
return false;
@@ -187,7 +187,7 @@ bool OutdoorPvPMgr::HandleOpenGo(Player *plr, uint64 guid)
{
for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
{
if ((*itr)->HandleOpenGo(plr,guid))
if ((*itr)->HandleOpenGo(plr, guid))
return true;
}
return false;
@@ -197,7 +197,7 @@ void OutdoorPvPMgr::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid
{
for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
{
if ((*itr)->HandleGossipOption(plr,guid,gossipid))
if ((*itr)->HandleGossipOption(plr, guid, gossipid))
return;
}
}
@@ -206,7 +206,7 @@ bool OutdoorPvPMgr::CanTalkTo(Player * plr, Creature * c, GossipMenuItems gso)
{
for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
{
if ((*itr)->CanTalkTo(plr,c,gso))
if ((*itr)->CanTalkTo(plr, c, gso))
return true;
}
return false;
@@ -216,7 +216,7 @@ void OutdoorPvPMgr::HandleDropFlag(Player *plr, uint32 spellId)
{
for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
{
if ((*itr)->HandleDropFlag(plr,spellId))
if ((*itr)->HandleDropFlag(plr, spellId))
return;
}
}