From 33d475caf38acb0ee9441c0d6210c87fd3d90f89 Mon Sep 17 00:00:00 2001 From: XTZGZoReX Date: Sun, 8 Nov 2009 04:21:43 +0100 Subject: [PATCH] [8786] Rename some files. * HostilRefManager.cpp/.h -> HostileRefManager.cpp/.h * PoolHandler.cpp/.h -> PoolManager.cpp/.h --- src/game/Creature.cpp | 2 +- src/game/GameEventMgr.cpp | 2 +- src/game/GameObject.cpp | 2 +- ...ilRefManager.cpp => HostileRefManager.cpp} | 2 +- ...HostilRefManager.h => HostileRefManager.h} | 0 src/game/Level2.cpp | 2 +- src/game/Makefile.am | 8 +++---- src/game/{PoolHandler.cpp => PoolManager.cpp} | 24 +++++++++---------- src/game/{PoolHandler.h => PoolManager.h} | 8 +++---- src/game/Unit.h | 2 +- src/game/World.cpp | 2 +- src/shared/revision_nr.h | 2 +- win/VC100/game.vcxproj | 8 +++---- win/VC80/game.vcproj | 8 +++---- win/VC90/game.vcproj | 8 +++---- 15 files changed, 40 insertions(+), 40 deletions(-) rename src/game/{HostilRefManager.cpp => HostileRefManager.cpp} (99%) rename src/game/{HostilRefManager.h => HostileRefManager.h} (100%) rename src/game/{PoolHandler.cpp => PoolManager.cpp} (97%) rename src/game/{PoolHandler.h => PoolManager.h} (96%) diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 09fbf236e..975de602e 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -26,7 +26,7 @@ #include "QuestDef.h" #include "GossipDef.h" #include "Player.h" -#include "PoolHandler.h" +#include "PoolManager.h" #include "Opcodes.h" #include "Log.h" #include "LootMgr.h" diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp index 1e425aed7..a64596e8f 100644 --- a/src/game/GameEventMgr.cpp +++ b/src/game/GameEventMgr.cpp @@ -19,7 +19,7 @@ #include "GameEventMgr.h" #include "World.h" #include "ObjectMgr.h" -#include "PoolHandler.h" +#include "PoolManager.h" #include "ProgressBar.h" #include "Language.h" #include "Log.h" diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 92bd2af22..fb01c983f 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -20,7 +20,7 @@ #include "QuestDef.h" #include "GameObject.h" #include "ObjectMgr.h" -#include "PoolHandler.h" +#include "PoolManager.h" #include "SpellMgr.h" #include "Spell.h" #include "UpdateMask.h" diff --git a/src/game/HostilRefManager.cpp b/src/game/HostileRefManager.cpp similarity index 99% rename from src/game/HostilRefManager.cpp rename to src/game/HostileRefManager.cpp index c9cd9cd97..12accb7cf 100644 --- a/src/game/HostilRefManager.cpp +++ b/src/game/HostileRefManager.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "HostilRefManager.h" +#include "HostileRefManager.h" #include "ThreatManager.h" #include "Unit.h" #include "DBCStructure.h" diff --git a/src/game/HostilRefManager.h b/src/game/HostileRefManager.h similarity index 100% rename from src/game/HostilRefManager.h rename to src/game/HostileRefManager.h diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 9749bfc8d..b4f6d587f 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -30,7 +30,7 @@ #include "World.h" #include "GameEventMgr.h" #include "SpellMgr.h" -#include "PoolHandler.h" +#include "PoolManager.h" #include "AccountMgr.h" #include "GMTicketMgr.h" #include "WaypointManager.h" diff --git a/src/game/Makefile.am b/src/game/Makefile.am index 2feb09216..39a6cb5b8 100644 --- a/src/game/Makefile.am +++ b/src/game/Makefile.am @@ -148,8 +148,8 @@ libmangosgame_a_SOURCES = \ GuildHandler.cpp \ HomeMovementGenerator.cpp \ HomeMovementGenerator.h \ - HostilRefManager.cpp \ - HostilRefManager.h \ + HostileRefManager.cpp \ + HostileRefManager.h \ IdleMovementGenerator.cpp \ IdleMovementGenerator.h \ InstanceData.cpp \ @@ -218,8 +218,8 @@ libmangosgame_a_SOURCES = \ PlayerDump.h \ PointMovementGenerator.cpp \ PointMovementGenerator.h \ - PoolHandler.cpp \ - PoolHandler.h \ + PoolManager.cpp \ + PoolManager.h \ QueryHandler.cpp \ QuestDef.cpp \ QuestDef.h \ diff --git a/src/game/PoolHandler.cpp b/src/game/PoolManager.cpp similarity index 97% rename from src/game/PoolHandler.cpp rename to src/game/PoolManager.cpp index 5a22f69fb..5090735b5 100644 --- a/src/game/PoolHandler.cpp +++ b/src/game/PoolManager.cpp @@ -16,14 +16,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "PoolHandler.h" +#include "PoolManager.h" #include "ObjectMgr.h" #include "ProgressBar.h" #include "Log.h" #include "MapManager.h" #include "Policies/SingletonImp.h" -INSTANTIATE_SINGLETON_1(PoolHandler); +INSTANTIATE_SINGLETON_1(PoolManager); //////////////////////////////////////////////////////////// // Methods of template class PoolGroup @@ -343,14 +343,14 @@ bool PoolGroup::ReSpawn1Object(uint32 /*guid*/) //////////////////////////////////////////////////////////// -// Methods of class PoolHandler +// Methods of class PoolManager -PoolHandler::PoolHandler() +PoolManager::PoolManager() { m_IsPoolSystemStarted = false; } -void PoolHandler::LoadFromDB() +void PoolManager::LoadFromDB() { QueryResult *result = WorldDatabase.Query("SELECT MAX(entry) FROM pool_template"); if (!result) @@ -619,7 +619,7 @@ void PoolHandler::LoadFromDB() } // The initialize method will spawn all pools not in an event and not in another pool, this is why there is 2 left joins with 2 null checks -void PoolHandler::Initialize() +void PoolManager::Initialize() { QueryResult *result = WorldDatabase.Query("SELECT DISTINCT pool_template.entry FROM pool_template LEFT JOIN game_event_pool ON pool_template.entry=game_event_pool.pool_entry LEFT JOIN pool_pool ON pool_template.entry=pool_pool.pool_id WHERE game_event_pool.pool_entry IS NULL AND pool_pool.pool_id IS NULL"); uint32 count=0; @@ -648,7 +648,7 @@ void PoolHandler::Initialize() // Call to spawn a pool, if cache if true the method will spawn only if cached entry is different // If it's same, the gameobject/creature is respawned only (added back to map) -void PoolHandler::SpawnPool(uint16 pool_id, uint32 guid, uint32 type) +void PoolManager::SpawnPool(uint16 pool_id, uint32 guid, uint32 type) { switch (type) { @@ -667,7 +667,7 @@ void PoolHandler::SpawnPool(uint16 pool_id, uint32 guid, uint32 type) } // Call to despawn a pool, all gameobjects/creatures in this pool are removed -void PoolHandler::DespawnPool(uint16 pool_id) +void PoolManager::DespawnPool(uint16 pool_id) { if (!mPoolCreatureGroups[pool_id].isEmpty()) mPoolCreatureGroups[pool_id].DespawnObject(); @@ -682,7 +682,7 @@ void PoolHandler::DespawnPool(uint16 pool_id) // Call to update the pool when a gameobject/creature part of pool [pool_id] is ready to respawn // Here we cache only the creature/gameobject whose guid is passed as parameter // Then the spawn pool call will use this cache to decide -void PoolHandler::UpdatePool(uint16 pool_id, uint32 guid, uint32 type) +void PoolManager::UpdatePool(uint16 pool_id, uint32 guid, uint32 type) { if (uint16 motherpoolid = IsPartOfAPool(pool_id, 0)) SpawnPool(motherpoolid, 0, 0); @@ -691,7 +691,7 @@ void PoolHandler::UpdatePool(uint16 pool_id, uint32 guid, uint32 type) } // Method that tell if the gameobject/creature is part of a pool and return the pool id if yes -uint16 PoolHandler::IsPartOfAPool(uint32 guid, uint32 type) +uint16 PoolManager::IsPartOfAPool(uint32 guid, uint32 type) { if (type == 0) // pool of pool { @@ -715,7 +715,7 @@ uint16 PoolHandler::IsPartOfAPool(uint32 guid, uint32 type) } // Method that check chance integrity of the creatures and gameobjects in this pool -bool PoolHandler::CheckPool(uint16 pool_id) +bool PoolManager::CheckPool(uint16 pool_id) { return pool_id <= max_pool_id && mPoolGameobjectGroups[pool_id].CheckPool() && @@ -724,7 +724,7 @@ bool PoolHandler::CheckPool(uint16 pool_id) } // Method that tell if a creature or gameobject in pool_id is spawned currently -bool PoolHandler::IsSpawnedObject(uint16 pool_id, uint32 guid, uint32 type) +bool PoolManager::IsSpawnedObject(uint16 pool_id, uint32 guid, uint32 type) { if (pool_id > max_pool_id) return false; diff --git a/src/game/PoolHandler.h b/src/game/PoolManager.h similarity index 96% rename from src/game/PoolHandler.h rename to src/game/PoolManager.h index 9ea0cd376..6d2b83a16 100644 --- a/src/game/PoolHandler.h +++ b/src/game/PoolManager.h @@ -65,11 +65,11 @@ class Pool // for Pool of Pool { }; -class PoolHandler +class PoolManager { public: - PoolHandler(); - ~PoolHandler() {}; + PoolManager(); + ~PoolManager() {}; void LoadFromDB(); uint16 IsPartOfAPool(uint32 guid, uint32 type); bool IsSpawnedObject(uint16 pool_id, uint32 guid, uint32 type); @@ -99,5 +99,5 @@ class PoolHandler }; -#define poolhandler MaNGOS::Singleton::Instance() +#define poolhandler MaNGOS::Singleton::Instance() #endif diff --git a/src/game/Unit.h b/src/game/Unit.h index b481c3771..619df4a83 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -26,7 +26,7 @@ #include "UpdateFields.h" #include "SharedDefines.h" #include "ThreatManager.h" -#include "HostilRefManager.h" +#include "HostileRefManager.h" #include "FollowerReference.h" #include "FollowerRefManager.h" #include "Utilities/EventProcessor.h" diff --git a/src/game/World.cpp b/src/game/World.cpp index 4624ac8ac..3f77b6c4d 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -54,7 +54,7 @@ #include "VMapFactory.h" #include "GlobalEvents.h" #include "GameEventMgr.h" -#include "PoolHandler.h" +#include "PoolManager.h" #include "Database/DatabaseImpl.h" #include "GridNotifiersImpl.h" #include "CellImpl.h" diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 755210c68..b24ff9977 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8785" + #define REVISION_NR "8786" #endif // __REVISION_NR_H__ diff --git a/win/VC100/game.vcxproj b/win/VC100/game.vcxproj index 7b26ec3df..6b648c5ac 100644 --- a/win/VC100/game.vcxproj +++ b/win/VC100/game.vcxproj @@ -407,7 +407,7 @@ - + @@ -454,7 +454,7 @@ - + @@ -557,7 +557,7 @@ - + @@ -590,7 +590,7 @@ - + diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj index db509f9b2..a7b62a9f2 100644 --- a/win/VC80/game.vcproj +++ b/win/VC80/game.vcproj @@ -878,11 +878,11 @@ >