mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 10:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various Cleanups (game F-K)

Browse source
This commit is contained in:
Schmoozerd 2012-07-19 21:46:24 +02:00
parent c5c09cee3c
commit 2bd41afb3e
44 changed files with 1903 additions and 1881 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/game/GridNotifiers.cpp
View file

@ -29,9 +29,9 @@
using namespace MaNGOS;
void VisibleChangesNotifier::Visit(CameraMapType &m)
void VisibleChangesNotifier::Visit(CameraMapType& m)
{
for(CameraMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
for (CameraMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
{
iter->getSource()->UpdateVisibilityOf(&i_object);
}
@ -42,9 +42,9 @@ void VisibleNotifier::Notify()
Player& player = *i_camera.GetOwner();
// at this moment i_clientGUIDs have guids that not iterate at grid level checks
// but exist one case when this possible and object not out of range: transports
if(Transport* transport = player.GetTransport())
if (Transport* transport = player.GetTransport())
{
for(Transport::PlayerSet::const_iterator itr = transport->GetPassengers().begin();itr!=transport->GetPassengers().end();++itr)
for (Transport::PlayerSet::const_iterator itr = transport->GetPassengers().begin(); itr!=transport->GetPassengers().end(); ++itr)
{
if (i_clientGUIDs.find((*itr)->GetObjectGuid()) != i_clientGUIDs.end())
{
@ -58,12 +58,12 @@ void VisibleNotifier::Notify()
// generate outOfRange for not iterate objects
i_data.AddOutOfRangeGUID(i_clientGUIDs);
for(GuidSet::iterator itr = i_clientGUIDs.begin();itr!=i_clientGUIDs.end();++itr)
for (GuidSet::iterator itr = i_clientGUIDs.begin(); itr!=i_clientGUIDs.end(); ++itr)
{
player.m_clientGUIDs.erase(*itr);
DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "%s is out of range (no in active cells set) now for %s",
itr->GetString().c_str(), player.GetGuidStr().c_str());
itr->GetString().c_str(), player.GetGuidStr().c_str());
}
if (i_data.HasData())
@ -75,7 +75,7 @@ void VisibleNotifier::Notify()
// send out of range to other players if need
GuidSet const& oor = i_data.GetOutOfRangeGUIDs();
for(GuidSet::const_iterator iter = oor.begin(); iter != oor.end(); ++iter)
for (GuidSet::const_iterator iter = oor.begin(); iter != oor.end(); ++iter)
{
if (!iter->IsPlayer())
continue;
@ -88,7 +88,7 @@ void VisibleNotifier::Notify()
// Now do operations that required done at object visibility change to visible
// send data at target visibility change (adding to client)
for(std::set<WorldObject*>::const_iterator vItr = i_visibleNow.begin(); vItr != i_visibleNow.end(); ++vItr)
for (std::set<WorldObject*>::const_iterator vItr = i_visibleNow.begin(); vItr != i_visibleNow.end(); ++vItr)
{
// target aura duration for caster show only if target exist at caster client
if ((*vItr) != &player && (*vItr)->isType(TYPEMASK_UNIT))
@ -96,9 +96,9 @@ void VisibleNotifier::Notify()
}
}
void MessageDeliverer::Visit(CameraMapType &m)
void MessageDeliverer::Visit(CameraMapType& m)
{
for(CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
for (CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
{
Player* owner = iter->getSource()->GetOwner();
@ -113,9 +113,9 @@ void MessageDeliverer::Visit(CameraMapType &m)
}
}
void MessageDelivererExcept::Visit(CameraMapType &m)
void MessageDelivererExcept::Visit(CameraMapType& m)
{
for(CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
for (CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
{
Player* owner = iter->getSource()->GetOwner();
@ -127,27 +127,27 @@ void MessageDelivererExcept::Visit(CameraMapType &m)
}
}
void ObjectMessageDeliverer::Visit(CameraMapType &m)
void ObjectMessageDeliverer::Visit(CameraMapType& m)
{
for(CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
for (CameraMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
{
if(!iter->getSource()->GetBody()->InSamePhase(i_phaseMask))
if (!iter->getSource()->GetBody()->InSamePhase(i_phaseMask))
continue;
if(WorldSession* session = iter->getSource()->GetOwner()->GetSession())
if (WorldSession* session = iter->getSource()->GetOwner()->GetSession())
session->SendPacket(i_message);
}
}
void MessageDistDeliverer::Visit(CameraMapType &m)
void MessageDistDeliverer::Visit(CameraMapType& m)
{
for(CameraMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
for (CameraMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
{
Player * owner = iter->getSource()->GetOwner();
Player* owner = iter->getSource()->GetOwner();
if ((i_toSelf || owner != &i_player) &&
(!i_ownTeamOnly || owner->GetTeam() == i_player.GetTeam()) &&
(!i_dist || iter->getSource()->GetBody()->IsWithinDist(&i_player,i_dist)))
(!i_ownTeamOnly || owner->GetTeam() == i_player.GetTeam()) &&
(!i_dist || iter->getSource()->GetBody()->IsWithinDist(&i_player,i_dist)))
{
if (!i_player.InSamePhase(iter->getSource()->GetBody()))
continue;
@ -158,9 +158,9 @@ void MessageDistDeliverer::Visit(CameraMapType &m)
}
}
void ObjectMessageDistDeliverer::Visit(CameraMapType &m)
void ObjectMessageDistDeliverer::Visit(CameraMapType& m)
{
for(CameraMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
for (CameraMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
{
if (!i_dist || iter->getSource()->GetBody()->IsWithinDist(&i_object,i_dist))
{
@ -174,9 +174,9 @@ void ObjectMessageDistDeliverer::Visit(CameraMapType &m)
}
template<class T>
void ObjectUpdater::Visit(GridRefManager<T> &m)
void ObjectUpdater::Visit(GridRefManager<T>& m)
{
for(typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter)
for (typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter)
{
WorldObject::UpdateHelper helper(iter->getSource());
helper.Update(i_timeDiff);
@ -186,21 +186,21 @@ void ObjectUpdater::Visit(GridRefManager<T> &m)
bool CannibalizeObjectCheck::operator()(Corpse* u)
{
// ignore bones
if(u->GetType()==CORPSE_BONES)
if (u->GetType()==CORPSE_BONES)
return false;
Player* owner = ObjectAccessor::FindPlayer(u->GetOwnerGuid());
if( !owner || i_fobj->IsFriendlyTo(owner))
if (!owner || i_fobj->IsFriendlyTo(owner))
return false;
if(i_fobj->IsWithinDistInMap(u, i_range) )
if (i_fobj->IsWithinDistInMap(u, i_range))
return true;
return false;
}
void MaNGOS::RespawnDo::operator()( Creature* u ) const
void MaNGOS::RespawnDo::operator()(Creature* u) const
{
// prevent respawn creatures for not active BG event
Map* map = u->GetMap();
@ -214,7 +214,7 @@ void MaNGOS::RespawnDo::operator()( Creature* u ) const
u->Respawn();
}
void MaNGOS::RespawnDo::operator()( GameObject* u ) const
void MaNGOS::RespawnDo::operator()(GameObject* u) const
{
// prevent respawn gameobject for not active BG event
Map* map = u->GetMap();
@ -267,5 +267,5 @@ bool MaNGOS::AnyAssistCreatureInRangeCheck::operator()(Creature* u)
return true;
}
template void ObjectUpdater::Visit<GameObject>(GameObjectMapType &);
template void ObjectUpdater::Visit<DynamicObject>(DynamicObjectMapType &);
template void ObjectUpdater::Visit<GameObject>(GameObjectMapType&);
template void ObjectUpdater::Visit<DynamicObject>(DynamicObjectMapType&);