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

[10020] Drop unused member in VisibleNotifier structure and related functions

Browse source 
(based on SilverIce's repo commit e678555)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>

Also applied mangos code style to GridNotifiersImpl.h
This commit is contained in:
SilverIce 2010-06-02 09:36:52 +04:00 • committed by VladimirMangos
parent 57ca730a2f
commit d6c5207867
6 changed files with 127 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/game/GridNotifiers.cpp
View file

@ -53,7 +53,7 @@ VisibleNotifier::Notify()
{ {
// ignore far sight case // ignore far sight case
(*itr)->UpdateVisibilityOf((*itr),&i_player); (*itr)->UpdateVisibilityOf((*itr),&i_player);
i_player.UpdateVisibilityOf(&i_player,(*itr),i_data,i_data_updates,i_visibleNow); i_player.UpdateVisibilityOf(&i_player,(*itr),i_data,i_visibleNow);
i_clientGUIDs.erase((*itr)->GetGUID()); i_clientGUIDs.erase((*itr)->GetGUID());
} }
} }
@ -68,17 +68,6 @@ VisibleNotifier::Notify()
DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "%s is out of range (no in active cells set) now for player %u",itr->GetString().c_str(),i_player.GetGUIDLow()); DEBUG_FILTER_LOG(LOG_FILTER_VISIBILITY_CHANGES, "%s is out of range (no in active cells set) now for player %u",itr->GetString().c_str(),i_player.GetGUIDLow());
} }
// send update to other players (except player updates that already sent using SendUpdateToPlayer)
for(UpdateDataMapType::iterator iter = i_data_updates.begin(); iter != i_data_updates.end(); ++iter)
{
if(iter->first==&i_player)
continue;
WorldPacket packet;
iter->second.BuildPacket(&packet);
iter->first->GetSession()->SendPacket(&packet);
}
if( i_data.HasData() ) if( i_data.HasData() )
{ {
// send create/outofrange packet to player (except player create updates that already sent using SendUpdateToPlayer) // send create/outofrange packet to player (except player create updates that already sent using SendUpdateToPlayer)

1
src/game/GridNotifiers.h
View file

@ -40,7 +40,6 @@ namespace MaNGOS
{ {
Player &i_player; Player &i_player;
UpdateData i_data; UpdateData i_data;
UpdateDataMapType i_data_updates;
ObjectGuidSet i_clientGUIDs; ObjectGuidSet i_clientGUIDs;
std::set<WorldObject*> i_visibleNow; std::set<WorldObject*> i_visibleNow;

242
src/game/GridNotifiersImpl.h
View file

@ -29,39 +29,36 @@
#include "DBCEnums.h" #include "DBCEnums.h"
template<class T> template<class T>
inline void inline void MaNGOS::VisibleNotifier::Visit(GridRefManager<T> &m)
MaNGOS::VisibleNotifier::Visit(GridRefManager<T> &m)
{ {
WorldObject const* viewPoint = i_player.GetViewPoint(); WorldObject const* viewPoint = i_player.GetViewPoint();
for(typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter) for(typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter)
{ {
i_player.UpdateVisibilityOf(viewPoint,iter->getSource(),i_data,i_data_updates,i_visibleNow); i_player.UpdateVisibilityOf(viewPoint,iter->getSource(), i_data, i_visibleNow);
i_clientGUIDs.erase(iter->getSource()->GetGUID()); i_clientGUIDs.erase(iter->getSource()->GetGUID());
} }
} }
inline void inline void MaNGOS::ObjectUpdater::Visit(CreatureMapType &m)
MaNGOS::ObjectUpdater::Visit(CreatureMapType &m)
{ {
for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
iter->getSource()->Update(i_timeDiff); iter->getSource()->Update(i_timeDiff);
} }
inline void inline void MaNGOS::PlayerRelocationNotifier::Visit(PlayerMapType &m)
MaNGOS::PlayerRelocationNotifier::Visit(PlayerMapType &m)
{ {
for(PlayerMapType::iterator iter=m.begin(); iter != m.end(); ++iter) for(PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
{ {
if(&i_player==iter->getSource()) if (&i_player==iter->getSource())
continue; continue;
// visibility for players updated by ObjectAccessor::UpdateVisibilityFor calls in appropriate places // visibility for players updated by ObjectAccessor::UpdateVisibilityFor calls in appropriate places
// Cancel Trade // Cancel Trade
if(i_player.GetTrader()==iter->getSource()) if (i_player.GetTrader()==iter->getSource())
// iteraction distance // iteraction distance
if(!i_player.IsWithinDistInMap(iter->getSource(), 5)) if (!i_player.IsWithinDistInMap(iter->getSource(), INTERACTION_DISTANCE))
i_player.GetSession()->SendCancelTrade(); // will clode both side trade windows i_player.GetSession()->SendCancelTrade(); // will clode both side trade windows
} }
} }
@ -72,44 +69,42 @@ inline void PlayerCreatureRelocationWorker(Player* pl, WorldObject const* viewPo
pl->UpdateVisibilityOf(viewPoint,c); pl->UpdateVisibilityOf(viewPoint,c);
// Creature AI reaction // Creature AI reaction
if(!c->hasUnitState(UNIT_STAT_FLEEING)) if (!c->hasUnitState(UNIT_STAT_FLEEING))
{ {
if( c->AI() && c->AI()->IsVisible(pl) && !c->IsInEvadeMode() ) if (c->AI() && c->AI()->IsVisible(pl) && !c->IsInEvadeMode())
c->AI()->MoveInLineOfSight(pl); c->AI()->MoveInLineOfSight(pl);
} }
} }
inline void CreatureCreatureRelocationWorker(Creature* c1, Creature* c2) inline void CreatureCreatureRelocationWorker(Creature* c1, Creature* c2)
{ {
if(!c1->hasUnitState(UNIT_STAT_FLEEING)) if (!c1->hasUnitState(UNIT_STAT_FLEEING))
{ {
if( c1->AI() && c1->AI()->IsVisible(c2) && !c1->IsInEvadeMode() ) if (c1->AI() && c1->AI()->IsVisible(c2) && !c1->IsInEvadeMode())
c1->AI()->MoveInLineOfSight(c2); c1->AI()->MoveInLineOfSight(c2);
} }
if(!c2->hasUnitState(UNIT_STAT_FLEEING)) if (!c2->hasUnitState(UNIT_STAT_FLEEING))
{ {
if( c2->AI() && c2->AI()->IsVisible(c1) && !c2->IsInEvadeMode() ) if (c2->AI() && c2->AI()->IsVisible(c1) && !c2->IsInEvadeMode())
c2->AI()->MoveInLineOfSight(c1); c2->AI()->MoveInLineOfSight(c1);
} }
} }
inline void inline void MaNGOS::PlayerRelocationNotifier::Visit(CreatureMapType &m)
MaNGOS::PlayerRelocationNotifier::Visit(CreatureMapType &m)
{ {
if(!i_player.isAlive() || i_player.isInFlight()) if (!i_player.isAlive() || i_player.isInFlight())
return; return;
WorldObject const* viewPoint = i_player.GetViewPoint(); WorldObject const* viewPoint = i_player.GetViewPoint();
for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
if (iter->getSource()->isAlive()) if (iter->getSource()->isAlive())
PlayerCreatureRelocationWorker(&i_player,viewPoint,iter->getSource()); PlayerCreatureRelocationWorker(&i_player, viewPoint, iter->getSource());
} }
template<> template<>
inline void inline void MaNGOS::CreatureRelocationNotifier::Visit(PlayerMapType &m)
MaNGOS::CreatureRelocationNotifier::Visit(PlayerMapType &m)
{ {
if(!i_creature.isAlive()) if(!i_creature.isAlive())
return; return;
@ -121,26 +116,25 @@ MaNGOS::CreatureRelocationNotifier::Visit(PlayerMapType &m)
} }
template<> template<>
inline void inline void MaNGOS::CreatureRelocationNotifier::Visit(CreatureMapType &m)
MaNGOS::CreatureRelocationNotifier::Visit(CreatureMapType &m)
{ {
if(!i_creature.isAlive()) if (!i_creature.isAlive())
return; return;
for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
{ {
Creature* c = iter->getSource(); Creature* c = iter->getSource();
if( c != &i_creature && c->isAlive()) if (c != &i_creature && c->isAlive())
CreatureCreatureRelocationWorker(c, &i_creature); CreatureCreatureRelocationWorker(c, &i_creature);
} }
} }
inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target) inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
{ {
if(!target->isAlive() || target->isInFlight() ) if (!target->isAlive() || target->isInFlight() )
return; return;
if(target->GetTypeId()==TYPEID_UNIT && ((Creature*)target)->isTotem()) if (target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->isTotem())
return; return;
if (!i_dynobject.IsWithinDistInMap(target, i_dynobject.GetRadius())) if (!i_dynobject.IsWithinDistInMap(target, i_dynobject.GetRadius()))
@ -151,14 +145,14 @@ inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
return; return;
// Evade target // Evade target
if( target->GetTypeId()==TYPEID_UNIT && ((Creature*)target)->IsInEvadeMode() ) if (target->GetTypeId()==TYPEID_UNIT && ((Creature*)target)->IsInEvadeMode())
return; return;
//Check player targets and remove if in GM mode or GM invisibility (for not self casting case) //Check player targets and remove if in GM mode or GM invisibility (for not self casting case)
if( target->GetTypeId()==TYPEID_PLAYER && target != i_check && (((Player*)target)->isGameMaster() || ((Player*)target)->GetVisibility()==VISIBILITY_OFF) ) if (target->GetTypeId() == TYPEID_PLAYER && target != i_check && (((Player*)target)->isGameMaster() || ((Player*)target)->GetVisibility() == VISIBILITY_OFF))
return; return;
if (i_check->GetTypeId()==TYPEID_PLAYER ) if (i_check->GetTypeId() == TYPEID_PLAYER )
{ {
if (i_check->IsFriendlyTo( target )) if (i_check->IsFriendlyTo( target ))
return; return;
@ -174,9 +168,11 @@ inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
SpellEntry const *spellInfo = sSpellStore.LookupEntry(i_dynobject.GetSpellId()); SpellEntry const *spellInfo = sSpellStore.LookupEntry(i_dynobject.GetSpellId());
SpellEffectIndex eff_index = i_dynobject.GetEffIndex(); SpellEffectIndex eff_index = i_dynobject.GetEffIndex();
// Check target immune to spell or aura // Check target immune to spell or aura
if (target->IsImmunedToSpell(spellInfo) || target->IsImmunedToSpellEffect(spellInfo, eff_index)) if (target->IsImmunedToSpell(spellInfo) || target->IsImmunedToSpellEffect(spellInfo, eff_index))
return; return;
// Apply PersistentAreaAura on target // Apply PersistentAreaAura on target
PersistentAreaAura* Aur = new PersistentAreaAura(spellInfo, eff_index, NULL, target, i_dynobject.GetCaster()); PersistentAreaAura* Aur = new PersistentAreaAura(spellInfo, eff_index, NULL, target, i_dynobject.GetCaster());
target->AddAura(Aur); target->AddAura(Aur);
@ -184,18 +180,16 @@ inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
} }
template<> template<>
inline void inline void MaNGOS::DynamicObjectUpdater::Visit(CreatureMapType &m)
MaNGOS::DynamicObjectUpdater::Visit(CreatureMapType &m)
{ {
for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
VisitHelper(itr->getSource()); VisitHelper(itr->getSource());
} }
template<> template<>
inline void inline void MaNGOS::DynamicObjectUpdater::Visit(PlayerMapType &m)
MaNGOS::DynamicObjectUpdater::Visit(PlayerMapType &m)
{ {
for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
VisitHelper(itr->getSource()); VisitHelper(itr->getSource());
} }
@ -207,12 +201,12 @@ template<class Check>
void MaNGOS::WorldObjectSearcher<Check>::Visit(GameObjectMapType &m) void MaNGOS::WorldObjectSearcher<Check>::Visit(GameObjectMapType &m)
{ {
// already found // already found
if(i_object) if (i_object)
return; return;
for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if (i_check(itr->getSource())) if (i_check(itr->getSource()))
@ -227,15 +221,15 @@ template<class Check>
void MaNGOS::WorldObjectSearcher<Check>::Visit(PlayerMapType &m) void MaNGOS::WorldObjectSearcher<Check>::Visit(PlayerMapType &m)
{ {
// already found // already found
if(i_object) if (i_object)
return; return;
for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
{ {
i_object = itr->getSource(); i_object = itr->getSource();
return; return;
@ -247,15 +241,15 @@ template<class Check>
void MaNGOS::WorldObjectSearcher<Check>::Visit(CreatureMapType &m) void MaNGOS::WorldObjectSearcher<Check>::Visit(CreatureMapType &m)
{ {
// already found // already found
if(i_object) if (i_object)
return; return;
for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
{ {
i_object = itr->getSource(); i_object = itr->getSource();
return; return;
@ -267,15 +261,15 @@ template<class Check>
void MaNGOS::WorldObjectSearcher<Check>::Visit(CorpseMapType &m) void MaNGOS::WorldObjectSearcher<Check>::Visit(CorpseMapType &m)
{ {
// already found // already found
if(i_object) if (i_object)
return; return;
for(CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(CorpseMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
{ {
i_object = itr->getSource(); i_object = itr->getSource();
return; return;
@ -287,15 +281,15 @@ template<class Check>
void MaNGOS::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m) void MaNGOS::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m)
{ {
// already found // already found
if(i_object) if (i_object)
return; return;
for(DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(DynamicObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
{ {
i_object = itr->getSource(); i_object = itr->getSource();
return; return;
@ -306,45 +300,45 @@ void MaNGOS::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m)
template<class Check> template<class Check>
void MaNGOS::WorldObjectListSearcher<Check>::Visit(PlayerMapType &m) void MaNGOS::WorldObjectListSearcher<Check>::Visit(PlayerMapType &m)
{ {
for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
if(itr->getSource()->InSamePhase(i_phaseMask)) if (itr->getSource()->InSamePhase(i_phaseMask))
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
i_objects.push_back(itr->getSource()); i_objects.push_back(itr->getSource());
} }
template<class Check> template<class Check>
void MaNGOS::WorldObjectListSearcher<Check>::Visit(CreatureMapType &m) void MaNGOS::WorldObjectListSearcher<Check>::Visit(CreatureMapType &m)
{ {
for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
if(itr->getSource()->InSamePhase(i_phaseMask)) if (itr->getSource()->InSamePhase(i_phaseMask))
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
i_objects.push_back(itr->getSource()); i_objects.push_back(itr->getSource());
} }
template<class Check> template<class Check>
void MaNGOS::WorldObjectListSearcher<Check>::Visit(CorpseMapType &m) void MaNGOS::WorldObjectListSearcher<Check>::Visit(CorpseMapType &m)
{ {
for(CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(CorpseMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
if(itr->getSource()->InSamePhase(i_phaseMask)) if (itr->getSource()->InSamePhase(i_phaseMask))
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
i_objects.push_back(itr->getSource()); i_objects.push_back(itr->getSource());
} }
template<class Check> template<class Check>
void MaNGOS::WorldObjectListSearcher<Check>::Visit(GameObjectMapType &m) void MaNGOS::WorldObjectListSearcher<Check>::Visit(GameObjectMapType &m)
{ {
for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
if(itr->getSource()->InSamePhase(i_phaseMask)) if (itr->getSource()->InSamePhase(i_phaseMask))
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
i_objects.push_back(itr->getSource()); i_objects.push_back(itr->getSource());
} }
template<class Check> template<class Check>
void MaNGOS::WorldObjectListSearcher<Check>::Visit(DynamicObjectMapType &m) void MaNGOS::WorldObjectListSearcher<Check>::Visit(DynamicObjectMapType &m)
{ {
for(DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(DynamicObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
if(itr->getSource()->InSamePhase(i_phaseMask)) if (itr->getSource()->InSamePhase(i_phaseMask))
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
i_objects.push_back(itr->getSource()); i_objects.push_back(itr->getSource());
} }
@ -354,15 +348,15 @@ template<class Check>
void MaNGOS::GameObjectSearcher<Check>::Visit(GameObjectMapType &m) void MaNGOS::GameObjectSearcher<Check>::Visit(GameObjectMapType &m)
{ {
// already found // already found
if(i_object) if (i_object)
return; return;
for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
{ {
i_object = itr->getSource(); i_object = itr->getSource();
return; return;
@ -373,12 +367,12 @@ void MaNGOS::GameObjectSearcher<Check>::Visit(GameObjectMapType &m)
template<class Check> template<class Check>
void MaNGOS::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m) void MaNGOS::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m)
{ {
for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
i_object = itr->getSource(); i_object = itr->getSource();
} }
} }
@ -386,9 +380,9 @@ void MaNGOS::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m)
template<class Check> template<class Check>
void MaNGOS::GameObjectListSearcher<Check>::Visit(GameObjectMapType &m) void MaNGOS::GameObjectListSearcher<Check>::Visit(GameObjectMapType &m)
{ {
for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(GameObjectMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
if(itr->getSource()->InSamePhase(i_phaseMask)) if (itr->getSource()->InSamePhase(i_phaseMask))
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
i_objects.push_back(itr->getSource()); i_objects.push_back(itr->getSource());
} }
@ -398,15 +392,15 @@ template<class Check>
void MaNGOS::UnitSearcher<Check>::Visit(CreatureMapType &m) void MaNGOS::UnitSearcher<Check>::Visit(CreatureMapType &m)
{ {
// already found // already found
if(i_object) if (i_object)
return; return;
for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
{ {
i_object = itr->getSource(); i_object = itr->getSource();
return; return;
@ -418,15 +412,15 @@ template<class Check>
void MaNGOS::UnitSearcher<Check>::Visit(PlayerMapType &m) void MaNGOS::UnitSearcher<Check>::Visit(PlayerMapType &m)
{ {
// already found // already found
if(i_object) if (i_object)
return; return;
for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
{ {
i_object = itr->getSource(); i_object = itr->getSource();
return; return;
@ -437,12 +431,12 @@ void MaNGOS::UnitSearcher<Check>::Visit(PlayerMapType &m)
template<class Check> template<class Check>
void MaNGOS::UnitLastSearcher<Check>::Visit(CreatureMapType &m) void MaNGOS::UnitLastSearcher<Check>::Visit(CreatureMapType &m)
{ {
for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
i_object = itr->getSource(); i_object = itr->getSource();
} }
} }
@ -450,12 +444,12 @@ void MaNGOS::UnitLastSearcher<Check>::Visit(CreatureMapType &m)
template<class Check> template<class Check>
void MaNGOS::UnitLastSearcher<Check>::Visit(PlayerMapType &m) void MaNGOS::UnitLastSearcher<Check>::Visit(PlayerMapType &m)
{ {
for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
i_object = itr->getSource(); i_object = itr->getSource();
} }
} }
@ -463,18 +457,18 @@ void MaNGOS::UnitLastSearcher<Check>::Visit(PlayerMapType &m)
template<class Check> template<class Check>
void MaNGOS::UnitListSearcher<Check>::Visit(PlayerMapType &m) void MaNGOS::UnitListSearcher<Check>::Visit(PlayerMapType &m)
{ {
for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
if(itr->getSource()->InSamePhase(i_phaseMask)) if (itr->getSource()->InSamePhase(i_phaseMask))
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
i_objects.push_back(itr->getSource()); i_objects.push_back(itr->getSource());
} }
template<class Check> template<class Check>
void MaNGOS::UnitListSearcher<Check>::Visit(CreatureMapType &m) void MaNGOS::UnitListSearcher<Check>::Visit(CreatureMapType &m)
{ {
for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
if(itr->getSource()->InSamePhase(i_phaseMask)) if (itr->getSource()->InSamePhase(i_phaseMask))
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
i_objects.push_back(itr->getSource()); i_objects.push_back(itr->getSource());
} }
@ -484,15 +478,15 @@ template<class Check>
void MaNGOS::CreatureSearcher<Check>::Visit(CreatureMapType &m) void MaNGOS::CreatureSearcher<Check>::Visit(CreatureMapType &m)
{ {
// already found // already found
if(i_object) if (i_object)
return; return;
for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
{ {
i_object = itr->getSource(); i_object = itr->getSource();
return; return;
@ -503,12 +497,12 @@ void MaNGOS::CreatureSearcher<Check>::Visit(CreatureMapType &m)
template<class Check> template<class Check>
void MaNGOS::CreatureLastSearcher<Check>::Visit(CreatureMapType &m) void MaNGOS::CreatureLastSearcher<Check>::Visit(CreatureMapType &m)
{ {
for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
i_object = itr->getSource(); i_object = itr->getSource();
} }
} }
@ -516,9 +510,9 @@ void MaNGOS::CreatureLastSearcher<Check>::Visit(CreatureMapType &m)
template<class Check> template<class Check>
void MaNGOS::CreatureListSearcher<Check>::Visit(CreatureMapType &m) void MaNGOS::CreatureListSearcher<Check>::Visit(CreatureMapType &m)
{ {
for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(CreatureMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
if(itr->getSource()->InSamePhase(i_phaseMask)) if (itr->getSource()->InSamePhase(i_phaseMask))
if( i_check(itr->getSource())) if (i_check(itr->getSource()))
i_objects.push_back(itr->getSource()); i_objects.push_back(itr->getSource());
} }
@ -526,15 +520,15 @@ template<class Check>
void MaNGOS::PlayerSearcher<Check>::Visit(PlayerMapType &m) void MaNGOS::PlayerSearcher<Check>::Visit(PlayerMapType &m)
{ {
// already found // already found
if(i_object) if (i_object)
return; return;
for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) for(PlayerMapType::iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
if(!itr->getSource()->InSamePhase(i_phaseMask)) if (!itr->getSource()->InSamePhase(i_phaseMask))
continue; continue;
if(i_check(itr->getSource())) if (i_check(itr->getSource()))
{ {
i_object = itr->getSource(); i_object = itr->getSource();
return; return;
@ -550,14 +544,14 @@ void MaNGOS::LocalizedPacketDo<Builder>::operator()( Player* p )
WorldPacket* data; WorldPacket* data;
// create if not cached yet // create if not cached yet
if(i_data_cache.size() < cache_idx+1 || !i_data_cache[cache_idx]) if (i_data_cache.size() < cache_idx+1 || !i_data_cache[cache_idx])
{ {
if(i_data_cache.size() < cache_idx+1) if (i_data_cache.size() < cache_idx+1)
i_data_cache.resize(cache_idx+1); i_data_cache.resize(cache_idx+1);
data = new WorldPacket(SMSG_MESSAGECHAT, 200); data = new WorldPacket(SMSG_MESSAGECHAT, 200);
i_builder(*data,loc_idx); i_builder(*data, loc_idx);
i_data_cache[cache_idx] = data; i_data_cache[cache_idx] = data;
} }
@ -575,14 +569,14 @@ void MaNGOS::LocalizedPacketListDo<Builder>::operator()( Player* p )
WorldPacketList* data_list; WorldPacketList* data_list;
// create if not cached yet // create if not cached yet
if(i_data_cache.size() < cache_idx+1 || i_data_cache[cache_idx].empty()) if (i_data_cache.size() < cache_idx+1 || i_data_cache[cache_idx].empty())
{ {
if(i_data_cache.size() < cache_idx+1) if (i_data_cache.size() < cache_idx+1)
i_data_cache.resize(cache_idx+1); i_data_cache.resize(cache_idx+1);
data_list = &i_data_cache[cache_idx]; data_list = &i_data_cache[cache_idx];
i_builder(*data_list,loc_idx); i_builder(*data_list, loc_idx);
} }
else else
data_list = &i_data_cache[cache_idx]; data_list = &i_data_cache[cache_idx];

12
src/game/Player.cpp
View file

@ -19202,7 +19202,7 @@ inline void UpdateVisibilityOf_helper(ObjectGuidSet& s64, GameObject* target)
} }
template<class T> template<class T>
void Player::UpdateVisibilityOf(WorldObject const* viewPoint, T* target, UpdateData& data, UpdateDataMapType& /*data_updates*/, std::set<WorldObject*>& visibleNow) void Player::UpdateVisibilityOf(WorldObject const* viewPoint, T* target, UpdateData& data, std::set<WorldObject*>& visibleNow)
{ {
if(HaveAtClient(target)) if(HaveAtClient(target))
{ {
@ -19231,11 +19231,11 @@ void Player::UpdateVisibilityOf(WorldObject const* viewPoint, T* target, UpdateD
} }
} }
template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, Player* target, UpdateData& data, UpdateDataMapType& data_updates, std::set<WorldObject*>& visibleNow); template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, Player* target, UpdateData& data, std::set<WorldObject*>& visibleNow);
template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, Creature* target, UpdateData& data, UpdateDataMapType& data_updates, std::set<WorldObject*>& visibleNow); template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, Creature* target, UpdateData& data, std::set<WorldObject*>& visibleNow);
template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, Corpse* target, UpdateData& data, UpdateDataMapType& data_updates, std::set<WorldObject*>& visibleNow); template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, Corpse* target, UpdateData& data, std::set<WorldObject*>& visibleNow);
template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, GameObject* target, UpdateData& data, UpdateDataMapType& data_updates, std::set<WorldObject*>& visibleNow); template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, GameObject* target, UpdateData& data, std::set<WorldObject*>& visibleNow);
template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, DynamicObject* target, UpdateData& data, UpdateDataMapType& data_updates, std::set<WorldObject*>& visibleNow); template void Player::UpdateVisibilityOf(WorldObject const* viewPoint, DynamicObject* target, UpdateData& data, std::set<WorldObject*>& visibleNow);
void Player::InitPrimaryProfessions() void Player::InitPrimaryProfessions()
{ {

2
src/game/Player.h
View file

@ -2201,7 +2201,7 @@ class MANGOS_DLL_SPEC Player : public Unit
void UpdateVisibilityOf(WorldObject const* viewPoint, WorldObject* target); void UpdateVisibilityOf(WorldObject const* viewPoint, WorldObject* target);
template<class T> template<class T>
void UpdateVisibilityOf(WorldObject const* viewPoint,T* target, UpdateData& data, UpdateDataMapType& data_updates, std::set<WorldObject*>& visibleNow); void UpdateVisibilityOf(WorldObject const* viewPoint,T* target, UpdateData& data, std::set<WorldObject*>& visibleNow);
// Stealth detection system // Stealth detection system
void HandleStealthedUnitsDetection(); void HandleStealthedUnitsDetection();

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10019" #define REVISION_NR "10020"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__