From 2265aef916e3b2d63d87faa68a2b51e7d747c54c Mon Sep 17 00:00:00 2001 From: Seline Date: Tue, 14 Oct 2008 11:57:03 -0500 Subject: [svn] * Merge Temp dev SVN with Assembla. * Changes include: - Implementation of w12x's Outdoor PvP and Game Event Systems. - Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed). - All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql). - Improved Config cleanup. - And many more changes. --HG-- branch : trunk --- src/game/GridNotifiersImpl.h | 78 +++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 38 deletions(-) (limited to 'src/game/GridNotifiersImpl.h') diff --git a/src/game/GridNotifiersImpl.h b/src/game/GridNotifiersImpl.h index 9dd422a3ad3..f66d599b132 100644 --- a/src/game/GridNotifiersImpl.h +++ b/src/game/GridNotifiersImpl.h @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS + * Copyright (C) 2008 Trinity + * + * Thanks to the original authors: MaNGOS * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,16 +10,16 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef MANGOS_GRIDNOTIFIERSIMPL_H -#define MANGOS_GRIDNOTIFIERSIMPL_H +#ifndef TRINITY_GRIDNOTIFIERSIMPL_H +#define TRINITY_GRIDNOTIFIERSIMPL_H #include "GridNotifiers.h" #include "WorldPacket.h" @@ -29,7 +31,7 @@ template inline void -MaNGOS::VisibleNotifier::Visit(GridRefManager &m) +Trinity::VisibleNotifier::Visit(GridRefManager &m) { for(typename GridRefManager::iterator iter = m.begin(); iter != m.end(); ++iter) { @@ -39,7 +41,7 @@ MaNGOS::VisibleNotifier::Visit(GridRefManager &m) } inline void -MaNGOS::ObjectUpdater::Visit(CreatureMapType &m) +Trinity::ObjectUpdater::Visit(CreatureMapType &m) { for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter) if(!iter->getSource()->isSpiritService()) @@ -47,7 +49,7 @@ MaNGOS::ObjectUpdater::Visit(CreatureMapType &m) } inline void -MaNGOS::PlayerRelocationNotifier::Visit(PlayerMapType &m) +Trinity::PlayerRelocationNotifier::Visit(PlayerMapType &m) { for(PlayerMapType::iterator iter=m.begin(); iter != m.end(); ++iter) { @@ -93,7 +95,7 @@ inline void CreatureCreatureRelocationWorker(Creature* c1, Creature* c2) } inline void -MaNGOS::PlayerRelocationNotifier::Visit(CreatureMapType &m) +Trinity::PlayerRelocationNotifier::Visit(CreatureMapType &m) { if(!i_player.isAlive() || i_player.isInFlight()) return; @@ -105,7 +107,7 @@ MaNGOS::PlayerRelocationNotifier::Visit(CreatureMapType &m) template<> inline void -MaNGOS::CreatureRelocationNotifier::Visit(PlayerMapType &m) +Trinity::CreatureRelocationNotifier::Visit(PlayerMapType &m) { if(!i_creature.isAlive()) return; @@ -117,7 +119,7 @@ MaNGOS::CreatureRelocationNotifier::Visit(PlayerMapType &m) template<> inline void -MaNGOS::CreatureRelocationNotifier::Visit(CreatureMapType &m) +Trinity::CreatureRelocationNotifier::Visit(CreatureMapType &m) { if(!i_creature.isAlive()) return; @@ -130,7 +132,7 @@ MaNGOS::CreatureRelocationNotifier::Visit(CreatureMapType &m) } } -inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target) +inline void Trinity::DynamicObjectUpdater::VisitHelper(Unit* target) { if(!target->isAlive() || target->isInFlight() ) return; @@ -180,7 +182,7 @@ inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target) template<> inline void -MaNGOS::DynamicObjectUpdater::Visit(CreatureMapType &m) +Trinity::DynamicObjectUpdater::Visit(CreatureMapType &m) { for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) VisitHelper(itr->getSource()); @@ -188,7 +190,7 @@ MaNGOS::DynamicObjectUpdater::Visit(CreatureMapType &m) template<> inline void -MaNGOS::DynamicObjectUpdater::Visit(PlayerMapType &m) +Trinity::DynamicObjectUpdater::Visit(PlayerMapType &m) { for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) VisitHelper(itr->getSource()); @@ -199,7 +201,7 @@ MaNGOS::DynamicObjectUpdater::Visit(PlayerMapType &m) // WorldObject searchers & workers template -void MaNGOS::WorldObjectSearcher::Visit(GameObjectMapType &m) +void Trinity::WorldObjectSearcher::Visit(GameObjectMapType &m) { // already found if(i_object) @@ -216,7 +218,7 @@ void MaNGOS::WorldObjectSearcher::Visit(GameObjectMapType &m) } template -void MaNGOS::WorldObjectSearcher::Visit(PlayerMapType &m) +void Trinity::WorldObjectSearcher::Visit(PlayerMapType &m) { // already found if(i_object) @@ -233,7 +235,7 @@ void MaNGOS::WorldObjectSearcher::Visit(PlayerMapType &m) } template -void MaNGOS::WorldObjectSearcher::Visit(CreatureMapType &m) +void Trinity::WorldObjectSearcher::Visit(CreatureMapType &m) { // already found if(i_object) @@ -250,7 +252,7 @@ void MaNGOS::WorldObjectSearcher::Visit(CreatureMapType &m) } template -void MaNGOS::WorldObjectSearcher::Visit(CorpseMapType &m) +void Trinity::WorldObjectSearcher::Visit(CorpseMapType &m) { // already found if(i_object) @@ -267,7 +269,7 @@ void MaNGOS::WorldObjectSearcher::Visit(CorpseMapType &m) } template -void MaNGOS::WorldObjectSearcher::Visit(DynamicObjectMapType &m) +void Trinity::WorldObjectSearcher::Visit(DynamicObjectMapType &m) { // already found if(i_object) @@ -284,7 +286,7 @@ void MaNGOS::WorldObjectSearcher::Visit(DynamicObjectMapType &m) } template -void MaNGOS::WorldObjectListSearcher::Visit(PlayerMapType &m) +void Trinity::WorldObjectListSearcher::Visit(PlayerMapType &m) { for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(i_check(itr->getSource())) @@ -292,7 +294,7 @@ void MaNGOS::WorldObjectListSearcher::Visit(PlayerMapType &m) } template -void MaNGOS::WorldObjectListSearcher::Visit(CreatureMapType &m) +void Trinity::WorldObjectListSearcher::Visit(CreatureMapType &m) { for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(i_check(itr->getSource())) @@ -300,7 +302,7 @@ void MaNGOS::WorldObjectListSearcher::Visit(CreatureMapType &m) } template -void MaNGOS::WorldObjectListSearcher::Visit(CorpseMapType &m) +void Trinity::WorldObjectListSearcher::Visit(CorpseMapType &m) { for(CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(i_check(itr->getSource())) @@ -308,7 +310,7 @@ void MaNGOS::WorldObjectListSearcher::Visit(CorpseMapType &m) } template -void MaNGOS::WorldObjectListSearcher::Visit(GameObjectMapType &m) +void Trinity::WorldObjectListSearcher::Visit(GameObjectMapType &m) { for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(i_check(itr->getSource())) @@ -316,7 +318,7 @@ void MaNGOS::WorldObjectListSearcher::Visit(GameObjectMapType &m) } template -void MaNGOS::WorldObjectListSearcher::Visit(DynamicObjectMapType &m) +void Trinity::WorldObjectListSearcher::Visit(DynamicObjectMapType &m) { for(DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(i_check(itr->getSource())) @@ -326,7 +328,7 @@ void MaNGOS::WorldObjectListSearcher::Visit(DynamicObjectMapType &m) // Gameobject searchers template -void MaNGOS::GameObjectSearcher::Visit(GameObjectMapType &m) +void Trinity::GameObjectSearcher::Visit(GameObjectMapType &m) { // already found if(i_object) @@ -343,7 +345,7 @@ void MaNGOS::GameObjectSearcher::Visit(GameObjectMapType &m) } template -void MaNGOS::GameObjectLastSearcher::Visit(GameObjectMapType &m) +void Trinity::GameObjectLastSearcher::Visit(GameObjectMapType &m) { for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { @@ -353,7 +355,7 @@ void MaNGOS::GameObjectLastSearcher::Visit(GameObjectMapType &m) } template -void MaNGOS::GameObjectListSearcher::Visit(GameObjectMapType &m) +void Trinity::GameObjectListSearcher::Visit(GameObjectMapType &m) { for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(i_check(itr->getSource())) @@ -363,7 +365,7 @@ void MaNGOS::GameObjectListSearcher::Visit(GameObjectMapType &m) // Unit searchers template -void MaNGOS::UnitSearcher::Visit(CreatureMapType &m) +void Trinity::UnitSearcher::Visit(CreatureMapType &m) { // already found if(i_object) @@ -380,7 +382,7 @@ void MaNGOS::UnitSearcher::Visit(CreatureMapType &m) } template -void MaNGOS::UnitSearcher::Visit(PlayerMapType &m) +void Trinity::UnitSearcher::Visit(PlayerMapType &m) { // already found if(i_object) @@ -397,7 +399,7 @@ void MaNGOS::UnitSearcher::Visit(PlayerMapType &m) } template -void MaNGOS::UnitLastSearcher::Visit(CreatureMapType &m) +void Trinity::UnitLastSearcher::Visit(CreatureMapType &m) { for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { @@ -407,7 +409,7 @@ void MaNGOS::UnitLastSearcher::Visit(CreatureMapType &m) } template -void MaNGOS::UnitLastSearcher::Visit(PlayerMapType &m) +void Trinity::UnitLastSearcher::Visit(PlayerMapType &m) { for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { @@ -417,7 +419,7 @@ void MaNGOS::UnitLastSearcher::Visit(PlayerMapType &m) } template -void MaNGOS::UnitListSearcher::Visit(PlayerMapType &m) +void Trinity::UnitListSearcher::Visit(PlayerMapType &m) { for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(i_check(itr->getSource())) @@ -425,7 +427,7 @@ void MaNGOS::UnitListSearcher::Visit(PlayerMapType &m) } template -void MaNGOS::UnitListSearcher::Visit(CreatureMapType &m) +void Trinity::UnitListSearcher::Visit(CreatureMapType &m) { for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(i_check(itr->getSource())) @@ -435,7 +437,7 @@ void MaNGOS::UnitListSearcher::Visit(CreatureMapType &m) // Creature searchers template -void MaNGOS::CreatureSearcher::Visit(CreatureMapType &m) +void Trinity::CreatureSearcher::Visit(CreatureMapType &m) { // already found if(i_object) @@ -452,7 +454,7 @@ void MaNGOS::CreatureSearcher::Visit(CreatureMapType &m) } template -void MaNGOS::CreatureLastSearcher::Visit(CreatureMapType &m) +void Trinity::CreatureLastSearcher::Visit(CreatureMapType &m) { for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) { @@ -462,7 +464,7 @@ void MaNGOS::CreatureLastSearcher::Visit(CreatureMapType &m) } template -void MaNGOS::CreatureListSearcher::Visit(CreatureMapType &m) +void Trinity::CreatureListSearcher::Visit(CreatureMapType &m) { for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr) if(i_check(itr->getSource())) @@ -470,7 +472,7 @@ void MaNGOS::CreatureListSearcher::Visit(CreatureMapType &m) } template -void MaNGOS::PlayerSearcher::Visit(PlayerMapType &m) +void Trinity::PlayerSearcher::Visit(PlayerMapType &m) { // already found if(i_object) @@ -486,4 +488,4 @@ void MaNGOS::PlayerSearcher::Visit(PlayerMapType &m) } } -#endif // MANGOS_GRIDNOTIFIERSIMPL_H +#endif // TRINITY_GRIDNOTIFIERSIMPL_H -- cgit v1.2.3