diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp index 66eb25e4f..81c7d02e7 100644 --- a/src/common/Collision/DynamicTree.cpp +++ b/src/common/Collision/DynamicTree.cpp @@ -13,7 +13,7 @@ #include "RegularGrid.h" #include "Timer.h" #include "VMapFactory.h" -#include "VMapManager2.h" +#include "VMapMgr2.h" #include "WorldModel.h" #include @@ -317,7 +317,7 @@ void DynamicMapTree::GetAreaAndLiquidData(float x, float y, float z, uint32 phas data.floorZ = intersectionCallBack.GetLocationInfo().ground_Z; uint32 liquidType = intersectionCallBack.GetLocationInfo().hitModel->GetLiquidType(); float liquidLevel; - if (!reqLiquidType || (dynamic_cast(VMAP::VMapFactory::createOrGetVMapManager())->GetLiquidFlagsPtr(liquidType) & reqLiquidType)) + if (!reqLiquidType || (dynamic_cast(VMAP::VMapFactory::createOrGetVMapMgr())->GetLiquidFlagsPtr(liquidType) & reqLiquidType)) if (intersectionCallBack.GetHitModel()->GetLiquidLevel(v, intersectionCallBack.GetLocationInfo(), liquidLevel)) data.liquidInfo.emplace(liquidType, liquidLevel); diff --git a/src/common/Collision/Management/IMMAPManager.h b/src/common/Collision/Management/IMMAPMgr.h similarity index 88% rename from src/common/Collision/Management/IMMAPManager.h rename to src/common/Collision/Management/IMMAPMgr.h index 00f642011..6ba3c0bfb 100644 --- a/src/common/Collision/Management/IMMAPManager.h +++ b/src/common/Collision/Management/IMMAPMgr.h @@ -20,14 +20,14 @@ namespace MMAP MMAP_LOAD_RESULT_IGNORED, }; - class IMMapManager + class IMMapMgr { private: bool iEnablePathFinding; public: - IMMapManager() : iEnablePathFinding(true) {} - virtual ~IMMapManager(void) {} + IMMapMgr() : iEnablePathFinding(true) {} + virtual ~IMMapMgr(void) {} //Enabled/Disabled Pathfinding void setEnablePathFinding(bool value) { iEnablePathFinding = value; } diff --git a/src/common/Collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapMgr.h similarity index 97% rename from src/common/Collision/Management/IVMapManager.h rename to src/common/Collision/Management/IVMapMgr.h index c2ae897bf..eb17fe3e7 100644 --- a/src/common/Collision/Management/IVMapManager.h +++ b/src/common/Collision/Management/IVMapMgr.h @@ -55,16 +55,16 @@ namespace VMAP }; //=========================================================== - class IVMapManager + class IVMapMgr { private: bool iEnableLineOfSightCalc{true}; bool iEnableHeightCalc{true}; public: - IVMapManager() { } + IVMapMgr() { } - virtual ~IVMapManager() = default; + virtual ~IVMapMgr() = default; virtual int loadMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0; diff --git a/src/common/Collision/Management/MMapFactory.cpp b/src/common/Collision/Management/MMapFactory.cpp index d048d45d2..ad3462e13 100644 --- a/src/common/Collision/Management/MMapFactory.cpp +++ b/src/common/Collision/Management/MMapFactory.cpp @@ -12,17 +12,17 @@ namespace MMAP { // ######################## MMapFactory ######################## // our global singleton copy - MMapManager* g_MMapManager = nullptr; + MMapMgr* g_MMapMgr = nullptr; bool MMapFactory::forbiddenMaps[1000] = {0}; - MMapManager* MMapFactory::createOrGetMMapManager() + MMapMgr* MMapFactory::createOrGetMMapMgr() { - if (g_MMapManager == nullptr) + if (g_MMapMgr == nullptr) { - g_MMapManager = new MMapManager(); + g_MMapMgr = new MMapMgr(); } - return g_MMapManager; + return g_MMapMgr; } void MMapFactory::InitializeDisabledMaps() @@ -38,10 +38,10 @@ namespace MMAP void MMapFactory::clear() { - if (g_MMapManager) + if (g_MMapMgr) { - delete g_MMapManager; - g_MMapManager = nullptr; + delete g_MMapMgr; + g_MMapMgr = nullptr; } } } diff --git a/src/common/Collision/Management/MMapFactory.h b/src/common/Collision/Management/MMapFactory.h index 4f81d09d7..391e104d7 100644 --- a/src/common/Collision/Management/MMapFactory.h +++ b/src/common/Collision/Management/MMapFactory.h @@ -10,7 +10,7 @@ #include "DetourAlloc.h" #include "DetourExtended.h" #include "DetourNavMesh.h" -#include "MMapManager.h" +#include "MMapMgr.h" #include namespace MMAP @@ -24,11 +24,11 @@ namespace MMAP // static class // holds all mmap global data - // access point to MMapManager singleton + // access point to MMapMgr singleton class MMapFactory { public: - static MMapManager* createOrGetMMapManager(); + static MMapMgr* createOrGetMMapMgr(); static void clear(); static void InitializeDisabledMaps(); static bool forbiddenMaps[1000]; diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapMgr.cpp similarity index 92% rename from src/common/Collision/Management/MMapManager.cpp rename to src/common/Collision/Management/MMapMgr.cpp index 9bbbad28a..705ad6190 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapMgr.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "MMapManager.h" +#include "MMapMgr.h" #include "Config.h" #include "Errors.h" #include "Log.h" @@ -16,8 +16,8 @@ namespace MMAP static char const* const MAP_FILE_NAME_FORMAT = "%s/mmaps/%03i.mmap"; static char const* const TILE_FILE_NAME_FORMAT = "%s/mmaps/%03i%02i%02i.mmtile"; - // ######################## MMapManager ######################## - MMapManager::~MMapManager() + // ######################## MMapMgr ######################## + MMapMgr::~MMapMgr() { for (MMapDataSet::iterator i = loadedMMaps.begin(); i != loadedMMaps.end(); ++i) { @@ -28,9 +28,9 @@ namespace MMAP // if we had, tiles in MMapData->mmapLoadedTiles, their actual data is lost! } - void MMapManager::InitializeThreadUnsafe(const std::vector& mapIds) + void MMapMgr::InitializeThreadUnsafe(const std::vector& mapIds) { - // the caller must pass the list of all mapIds that will be used in the VMapManager2 lifetime + // the caller must pass the list of all mapIds that will be used in the VMapMgr2 lifetime for (const uint32& mapId : mapIds) { loadedMMaps.emplace(mapId, nullptr); @@ -39,7 +39,7 @@ namespace MMAP thread_safe_environment = false; } - MMapDataSet::const_iterator MMapManager::GetMMapData(uint32 mapId) const + MMapDataSet::const_iterator MMapMgr::GetMMapData(uint32 mapId) const { // return the iterator if found or end() if not found/NULL MMapDataSet::const_iterator itr = loadedMMaps.find(mapId); @@ -51,7 +51,7 @@ namespace MMAP return itr; } - bool MMapManager::loadMapData(uint32 mapId) + bool MMapMgr::loadMapData(uint32 mapId) { // we already have this map loaded? MMapDataSet::iterator itr = loadedMMaps.find(mapId); @@ -70,7 +70,7 @@ namespace MMAP } else { - ASSERT(false, "Invalid mapId %u passed to MMapManager after startup in thread unsafe environment", mapId); + ASSERT(false, "Invalid mapId %u passed to MMapMgr after startup in thread unsafe environment", mapId); } } @@ -110,12 +110,12 @@ namespace MMAP return true; } - uint32 MMapManager::packTileID(int32 x, int32 y) + uint32 MMapMgr::packTileID(int32 x, int32 y) { return uint32(x << 16 | y); } - bool MMapManager::loadMap(uint32 mapId, int32 x, int32 y) + bool MMapMgr::loadMap(uint32 mapId, int32 x, int32 y) { // make sure the mmap is loaded and ready to load tiles if (!loadMapData(mapId)) @@ -191,7 +191,7 @@ namespace MMAP return false; } - bool MMapManager::unloadMap(uint32 mapId, int32 x, int32 y) + bool MMapMgr::unloadMap(uint32 mapId, int32 x, int32 y) { // check if we have this map loaded MMapDataSet::const_iterator itr = GetMMapData(mapId); @@ -231,7 +231,7 @@ namespace MMAP return true; } - bool MMapManager::unloadMap(uint32 mapId) + bool MMapMgr::unloadMap(uint32 mapId) { MMapDataSet::iterator itr = loadedMMaps.find(mapId); if (itr == loadedMMaps.end() || !itr->second) @@ -266,7 +266,7 @@ namespace MMAP return true; } - bool MMapManager::unloadMapInstance(uint32 mapId, uint32 instanceId) + bool MMapMgr::unloadMapInstance(uint32 mapId, uint32 instanceId) { // check if we have this map loaded MMapDataSet::const_iterator itr = GetMMapData(mapId); @@ -293,7 +293,7 @@ namespace MMAP return true; } - dtNavMesh const* MMapManager::GetNavMesh(uint32 mapId) + dtNavMesh const* MMapMgr::GetNavMesh(uint32 mapId) { MMapDataSet::const_iterator itr = GetMMapData(mapId); if (itr == loadedMMaps.end()) @@ -304,7 +304,7 @@ namespace MMAP return itr->second->navMesh; } - dtNavMeshQuery const* MMapManager::GetNavMeshQuery(uint32 mapId, uint32 instanceId) + dtNavMeshQuery const* MMapMgr::GetNavMeshQuery(uint32 mapId, uint32 instanceId) { MMapDataSet::const_iterator itr = GetMMapData(mapId); if (itr == loadedMMaps.end()) diff --git a/src/common/Collision/Management/MMapManager.h b/src/common/Collision/Management/MMapMgr.h similarity index 95% rename from src/common/Collision/Management/MMapManager.h rename to src/common/Collision/Management/MMapMgr.h index aab546f81..226236cb7 100644 --- a/src/common/Collision/Management/MMapManager.h +++ b/src/common/Collision/Management/MMapMgr.h @@ -60,11 +60,11 @@ namespace MMAP // singleton class // holds all all access to mmap loading unloading and meshes - class MMapManager + class MMapMgr { public: - MMapManager() : loadedTiles(0), thread_safe_environment(true) { } - ~MMapManager(); + MMapMgr() : loadedTiles(0), thread_safe_environment(true) { } + ~MMapMgr(); void InitializeThreadUnsafe(const std::vector& mapIds); bool loadMap(uint32 mapId, int32 x, int32 y); diff --git a/src/common/Collision/Management/VMapFactory.cpp b/src/common/Collision/Management/VMapFactory.cpp index ac62e2bf1..2f6c170e5 100644 --- a/src/common/Collision/Management/VMapFactory.cpp +++ b/src/common/Collision/Management/VMapFactory.cpp @@ -5,29 +5,29 @@ */ #include "VMapFactory.h" -#include "VMapManager2.h" +#include "VMapMgr2.h" namespace VMAP { - VMapManager2* gVMapManager = nullptr; + VMapMgr2* gVMapMgr = nullptr; //=============================================== // just return the instance - VMapManager2* VMapFactory::createOrGetVMapManager() + VMapMgr2* VMapFactory::createOrGetVMapMgr() { - if (!gVMapManager) + if (!gVMapMgr) { - gVMapManager = new VMapManager2(); + gVMapMgr = new VMapMgr2(); } - return gVMapManager; + return gVMapMgr; } //=============================================== // delete all internal data structures void VMapFactory::clear() { - delete gVMapManager; - gVMapManager = nullptr; + delete gVMapMgr; + gVMapMgr = nullptr; } } diff --git a/src/common/Collision/Management/VMapFactory.h b/src/common/Collision/Management/VMapFactory.h index 03fe56976..aba09e17b 100644 --- a/src/common/Collision/Management/VMapFactory.h +++ b/src/common/Collision/Management/VMapFactory.h @@ -7,17 +7,17 @@ #ifndef _VMAPFACTORY_H #define _VMAPFACTORY_H -#include "IVMapManager.h" +#include "IVMapMgr.h" -// This is the access point to the VMapManager. +// This is the access point to the VMapMgr. namespace VMAP { - class VMapManager2; + class VMapMgr2; class VMapFactory { public: - static VMapManager2* createOrGetVMapManager(); + static VMapMgr2* createOrGetVMapMgr(); static void clear(); }; } diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapMgr2.cpp similarity index 82% rename from src/common/Collision/Management/VMapManager2.cpp rename to src/common/Collision/Management/VMapMgr2.cpp index 3cea89bf2..f2a723d70 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapMgr2.cpp @@ -15,7 +15,7 @@ * with this program. If not, see . */ -#include "VMapManager2.h" +#include "VMapMgr2.h" #include "Errors.h" #include "Log.h" #include "MapDefines.h" @@ -32,14 +32,14 @@ using G3D::Vector3; namespace VMAP { - VMapManager2::VMapManager2() + VMapMgr2::VMapMgr2() { GetLiquidFlagsPtr = &GetLiquidFlagsDummy; IsVMAPDisabledForPtr = &IsVMAPDisabledForDummy; thread_safe_environment = true; } - VMapManager2::~VMapManager2() + VMapMgr2::~VMapMgr2() { for (InstanceTreeMap::iterator i = iInstanceMapTrees.begin(); i != iInstanceMapTrees.end(); ++i) { @@ -52,9 +52,9 @@ namespace VMAP } } - void VMapManager2::InitializeThreadUnsafe(const std::vector& mapIds) + void VMapMgr2::InitializeThreadUnsafe(const std::vector& mapIds) { - // the caller must pass the list of all mapIds that will be used in the VMapManager2 lifetime + // the caller must pass the list of all mapIds that will be used in the VMapMgr2 lifetime for (const uint32& mapId : mapIds) { iInstanceMapTrees.emplace(mapId, nullptr); @@ -63,7 +63,7 @@ namespace VMAP thread_safe_environment = false; } - Vector3 VMapManager2::convertPositionToInternalRep(float x, float y, float z) const + Vector3 VMapMgr2::convertPositionToInternalRep(float x, float y, float z) const { Vector3 pos; const float mid = 0.5f * MAX_NUMBER_OF_GRIDS * SIZE_OF_GRIDS; @@ -74,7 +74,7 @@ namespace VMAP return pos; } - InstanceTreeMap::const_iterator VMapManager2::GetMapTree(uint32 mapId) const + InstanceTreeMap::const_iterator VMapMgr2::GetMapTree(uint32 mapId) const { // return the iterator if found or end() if not found/NULL InstanceTreeMap::const_iterator itr = iInstanceMapTrees.find(mapId); @@ -87,7 +87,7 @@ namespace VMAP } // move to MapTree too? - std::string VMapManager2::getMapFileName(unsigned int mapId) + std::string VMapMgr2::getMapFileName(unsigned int mapId) { std::stringstream fname; fname.width(3); @@ -96,7 +96,7 @@ namespace VMAP return fname.str(); } - int VMapManager2::loadMap(const char* basePath, unsigned int mapId, int x, int y) + int VMapMgr2::loadMap(const char* basePath, unsigned int mapId, int x, int y) { int result = VMAP_LOAD_RESULT_IGNORED; if (isMapLoadingEnabled()) @@ -115,7 +115,7 @@ namespace VMAP } // load one tile (internal use only) - bool VMapManager2::_loadMap(uint32 mapId, const std::string& basePath, uint32 tileX, uint32 tileY) + bool VMapMgr2::_loadMap(uint32 mapId, const std::string& basePath, uint32 tileX, uint32 tileY) { InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(mapId); if (instanceTree == iInstanceMapTrees.end()) @@ -125,7 +125,7 @@ namespace VMAP instanceTree = iInstanceMapTrees.insert(InstanceTreeMap::value_type(mapId, nullptr)).first; } else - ASSERT(false, "Invalid mapId %u tile [%u, %u] passed to VMapManager2 after startup in thread unsafe environment", + ASSERT(false, "Invalid mapId %u tile [%u, %u] passed to VMapMgr2 after startup in thread unsafe environment", mapId, tileX, tileY); } @@ -144,7 +144,7 @@ namespace VMAP return instanceTree->second->LoadMapTile(tileX, tileY, this); } - void VMapManager2::unloadMap(unsigned int mapId) + void VMapMgr2::unloadMap(unsigned int mapId) { InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(mapId); if (instanceTree != iInstanceMapTrees.end() && instanceTree->second) @@ -158,7 +158,7 @@ namespace VMAP } } - void VMapManager2::unloadMap(unsigned int mapId, int x, int y) + void VMapMgr2::unloadMap(unsigned int mapId, int x, int y) { InstanceTreeMap::iterator instanceTree = iInstanceMapTrees.find(mapId); if (instanceTree != iInstanceMapTrees.end() && instanceTree->second) @@ -172,7 +172,7 @@ namespace VMAP } } - bool VMapManager2::isInLineOfSight(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2) + bool VMapMgr2::isInLineOfSight(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2) { #if defined(ENABLE_VMAP_CHECKS) if (!isLineOfSightCalcEnabled() || IsVMAPDisabledForPtr(mapId, VMAP_DISABLE_LOS)) @@ -199,7 +199,7 @@ namespace VMAP get the hit position and return true if we hit something otherwise the result pos will be the dest pos */ - bool VMapManager2::GetObjectHitPos(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist) + bool VMapMgr2::GetObjectHitPos(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist) { #if defined(ENABLE_VMAP_CHECKS) if (isLineOfSightCalcEnabled() && !IsVMAPDisabledForPtr(mapId, VMAP_DISABLE_LOS)) @@ -231,7 +231,7 @@ namespace VMAP get height or INVALID_HEIGHT if no height available */ - float VMapManager2::getHeight(unsigned int mapId, float x, float y, float z, float maxSearchDist) + float VMapMgr2::getHeight(unsigned int mapId, float x, float y, float z, float maxSearchDist) { #if defined(ENABLE_VMAP_CHECKS) if (isHeightCalcEnabled() && !IsVMAPDisabledForPtr(mapId, VMAP_DISABLE_HEIGHT)) @@ -254,7 +254,7 @@ namespace VMAP return VMAP_INVALID_HEIGHT_VALUE; } - bool VMapManager2::GetAreaInfo(uint32 mapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const + bool VMapMgr2::GetAreaInfo(uint32 mapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const { #if defined(ENABLE_VMAP_CHECKS) if (!IsVMAPDisabledForPtr(mapId, VMAP_DISABLE_AREAFLAG)) @@ -274,7 +274,7 @@ namespace VMAP return false; } - bool VMapManager2::GetLiquidLevel(uint32 mapId, float x, float y, float z, uint8 reqLiquidType, float& level, float& floor, uint32& type, uint32& mogpFlags) const + bool VMapMgr2::GetLiquidLevel(uint32 mapId, float x, float y, float z, uint8 reqLiquidType, float& level, float& floor, uint32& type, uint32& mogpFlags) const { #if defined(ENABLE_VMAP_CHECKS) if (!IsVMAPDisabledForPtr(mapId, VMAP_DISABLE_LIQUIDSTATUS)) @@ -306,7 +306,7 @@ namespace VMAP return false; } - void VMapManager2::GetAreaAndLiquidData(uint32 mapId, float x, float y, float z, uint8 reqLiquidType, AreaAndLiquidData& data) const + void VMapMgr2::GetAreaAndLiquidData(uint32 mapId, float x, float y, float z, uint8 reqLiquidType, AreaAndLiquidData& data) const { if (IsVMAPDisabledForPtr(mapId, VMAP_DISABLE_LIQUIDSTATUS)) { @@ -338,7 +338,7 @@ namespace VMAP } } - WorldModel* VMapManager2::acquireModelInstance(const std::string& basepath, const std::string& filename) + WorldModel* VMapMgr2::acquireModelInstance(const std::string& basepath, const std::string& filename) { //! Critical section, thread safe access to iLoadedModelFiles std::lock_guard lock(LoadedModelFilesLock); @@ -349,11 +349,11 @@ namespace VMAP WorldModel* worldmodel = new WorldModel(); if (!worldmodel->readFile(basepath + filename + ".vmo")) { - LOG_ERROR("maps", "VMapManager2: could not load '%s%s.vmo'", basepath.c_str(), filename.c_str()); + LOG_ERROR("maps", "VMapMgr2: could not load '%s%s.vmo'", basepath.c_str(), filename.c_str()); delete worldmodel; return nullptr; } - LOG_DEBUG("maps", "VMapManager2: loading file '%s%s'", basepath.c_str(), filename.c_str()); + LOG_DEBUG("maps", "VMapMgr2: loading file '%s%s'", basepath.c_str(), filename.c_str()); model = iLoadedModelFiles.insert(std::pair(filename, ManagedModel())).first; model->second.setModel(worldmodel); } @@ -361,7 +361,7 @@ namespace VMAP return model->second.getModel(); } - void VMapManager2::releaseModelInstance(const std::string& filename) + void VMapMgr2::releaseModelInstance(const std::string& filename) { //! Critical section, thread safe access to iLoadedModelFiles std::lock_guard lock(LoadedModelFilesLock); @@ -369,23 +369,23 @@ namespace VMAP ModelFileMap::iterator model = iLoadedModelFiles.find(filename); if (model == iLoadedModelFiles.end()) { - LOG_ERROR("maps", "VMapManager2: trying to unload non-loaded file '%s'", filename.c_str()); + LOG_ERROR("maps", "VMapMgr2: trying to unload non-loaded file '%s'", filename.c_str()); return; } if (model->second.decRefCount() == 0) { - LOG_DEBUG("maps", "VMapManager2: unloading file '%s'", filename.c_str()); + LOG_DEBUG("maps", "VMapMgr2: unloading file '%s'", filename.c_str()); delete model->second.getModel(); iLoadedModelFiles.erase(model); } } - bool VMapManager2::existsMap(const char* basePath, unsigned int mapId, int x, int y) + bool VMapMgr2::existsMap(const char* basePath, unsigned int mapId, int x, int y) { return StaticMapTree::CanLoadMap(std::string(basePath), mapId, x, y); } - void VMapManager2::GetInstanceMapTree(InstanceTreeMap& instanceMapTree) + void VMapMgr2::GetInstanceMapTree(InstanceTreeMap& instanceMapTree) { instanceMapTree = iInstanceMapTrees; } diff --git a/src/common/Collision/Management/VMapManager2.h b/src/common/Collision/Management/VMapMgr2.h similarity index 97% rename from src/common/Collision/Management/VMapManager2.h rename to src/common/Collision/Management/VMapMgr2.h index 0e3fc2f9a..946061fe2 100644 --- a/src/common/Collision/Management/VMapManager2.h +++ b/src/common/Collision/Management/VMapMgr2.h @@ -6,7 +6,7 @@ #define _VMAPMANAGER2_H #include "Common.h" -#include "IVMapManager.h" +#include "IVMapMgr.h" #include #include #include @@ -60,7 +60,7 @@ namespace VMAP VMAP_DISABLE_LIQUIDSTATUS = 0x8 }; - class VMapManager2 : public IVMapManager + class VMapMgr2 : public IVMapMgr { protected: // Tree to check collision @@ -84,8 +84,8 @@ namespace VMAP [[nodiscard]] G3D::Vector3 convertPositionToInternalRep(float x, float y, float z) const; static std::string getMapFileName(unsigned int mapId); - VMapManager2(); - ~VMapManager2() override; + VMapMgr2(); + ~VMapMgr2() override; void InitializeThreadUnsafe(const std::vector& mapIds); diff --git a/src/common/Collision/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp index 62aef13ee..fd3137a86 100644 --- a/src/common/Collision/Maps/MapTree.cpp +++ b/src/common/Collision/Maps/MapTree.cpp @@ -9,7 +9,7 @@ #include "Log.h" #include "ModelInstance.h" #include "VMapDefinitions.h" -#include "VMapManager2.h" +#include "VMapMgr2.h" #include #include #include @@ -244,7 +244,7 @@ namespace VMAP { basePath.push_back('/'); } - std::string fullname = basePath + VMapManager2::getMapFileName(mapID); + std::string fullname = basePath + VMapMgr2::getMapFileName(mapID); bool success = true; FILE* rf = fopen(fullname.c_str(), "rb"); if (!rf) @@ -282,7 +282,7 @@ namespace VMAP //========================================================= - bool StaticMapTree::InitMap(const std::string& fname, VMapManager2* vm) + bool StaticMapTree::InitMap(const std::string& fname, VMapMgr2* vm) { //VMAP_DEBUG_LOG(LOG_FILTER_MAPS, "StaticMapTree::InitMap() : initializing StaticMapTree '%s'", fname.c_str()); bool success = false; @@ -335,7 +335,7 @@ namespace VMAP //========================================================= - void StaticMapTree::UnloadMap(VMapManager2* vm) + void StaticMapTree::UnloadMap(VMapMgr2* vm) { for (loadedSpawnMap::iterator i = iLoadedSpawns.begin(); i != iLoadedSpawns.end(); ++i) { @@ -351,7 +351,7 @@ namespace VMAP //========================================================= - bool StaticMapTree::LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm) + bool StaticMapTree::LoadMapTile(uint32 tileX, uint32 tileY, VMapMgr2* vm) { if (!iIsTiled) { @@ -446,7 +446,7 @@ namespace VMAP //========================================================= - void StaticMapTree::UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm) + void StaticMapTree::UnloadMapTile(uint32 tileX, uint32 tileY, VMapMgr2* vm) { uint32 tileID = packTileID(tileX, tileY); loadedTileMap::iterator tile = iLoadedTiles.find(tileID); diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h index 7059be8f6..bda5da2e0 100644 --- a/src/common/Collision/Maps/MapTree.h +++ b/src/common/Collision/Maps/MapTree.h @@ -15,7 +15,7 @@ namespace VMAP { class ModelInstance; class GroupModel; - class VMapManager2; + class VMapMgr2; struct LocationInfo { @@ -63,10 +63,10 @@ namespace VMAP bool GetAreaInfo(G3D::Vector3& pos, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const; bool GetLocationInfo(const G3D::Vector3& pos, LocationInfo& info) const; - bool InitMap(const std::string& fname, VMapManager2* vm); - void UnloadMap(VMapManager2* vm); - bool LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm); - void UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm); + bool InitMap(const std::string& fname, VMapMgr2* vm); + void UnloadMap(VMapMgr2* vm); + bool LoadMapTile(uint32 tileX, uint32 tileY, VMapMgr2* vm); + void UnloadMapTile(uint32 tileX, uint32 tileY, VMapMgr2* vm); [[nodiscard]] bool isTiled() const { return iIsTiled; } [[nodiscard]] uint32 numLoadedTiles() const { return iLoadedTiles.size(); } void GetModelInstances(ModelInstance*& models, uint32& count); diff --git a/src/common/Collision/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp index 5ca1b64a3..9dea71f85 100644 --- a/src/common/Collision/Models/GameObjectModel.cpp +++ b/src/common/Collision/Models/GameObjectModel.cpp @@ -10,7 +10,7 @@ #include "Timer.h" #include "VMapDefinitions.h" #include "VMapFactory.h" -#include "VMapManager2.h" +#include "VMapMgr2.h" #include "WorldModel.h" using G3D::Vector3; @@ -92,7 +92,7 @@ GameObjectModel::~GameObjectModel() { if (iModel) { - VMAP::VMapFactory::createOrGetVMapManager()->releaseModelInstance(name); + VMAP::VMapFactory::createOrGetVMapMgr()->releaseModelInstance(name); } } @@ -112,7 +112,7 @@ bool GameObjectModel::initialize(std::unique_ptr model return false; } - iModel = VMAP::VMapFactory::createOrGetVMapManager()->acquireModelInstance(dataPath + "vmaps/", it->second.name); + iModel = VMAP::VMapFactory::createOrGetVMapMgr()->acquireModelInstance(dataPath + "vmaps/", it->second.name); if (!iModel) { diff --git a/src/common/Dynamic/LinkedReference/RefManager.h b/src/common/Dynamic/LinkedReference/RefMgr.h similarity index 91% rename from src/common/Dynamic/LinkedReference/RefManager.h rename to src/common/Dynamic/LinkedReference/RefMgr.h index ad7a1786d..6d451f8d0 100644 --- a/src/common/Dynamic/LinkedReference/RefManager.h +++ b/src/common/Dynamic/LinkedReference/RefMgr.h @@ -11,12 +11,12 @@ #include "Dynamic/LinkedList.h" #include "Dynamic/LinkedReference/Reference.h" -template class RefManager : public LinkedListHead +template class RefMgr : public LinkedListHead { public: typedef LinkedListHead::Iterator< Reference> iterator; - RefManager() = default; - virtual ~RefManager() { clearReferences(); } + RefMgr() = default; + virtual ~RefMgr() { clearReferences(); } Reference* getFirst() { return ((Reference*) LinkedListHead::getFirst()); } [[nodiscard]] Reference const* getFirst() const { return ((Reference const*) LinkedListHead::getFirst()); } diff --git a/src/common/Dynamic/TypeContainer.h b/src/common/Dynamic/TypeContainer.h index 677113e3e..3b54f229d 100644 --- a/src/common/Dynamic/TypeContainer.h +++ b/src/common/Dynamic/TypeContainer.h @@ -14,7 +14,7 @@ #include "Define.h" #include "Dynamic/TypeList.h" -#include "GridRefManager.h" +#include "GridRefMgr.h" #include #include #include @@ -28,7 +28,7 @@ template struct ContainerMapList { //std::map _element; - GridRefManager _element; + GridRefMgr _element; }; template<> diff --git a/src/common/Platform/ServiceWin32.cpp b/src/common/Platform/ServiceWin32.cpp index 475529a8f..c82a65873 100644 --- a/src/common/Platform/ServiceWin32.cpp +++ b/src/common/Platform/ServiceWin32.cpp @@ -35,16 +35,16 @@ typedef WINADVAPI BOOL (WINAPI* CSD_T)(SC_HANDLE, DWORD, LPCVOID); bool WinServiceInstall() { - SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CREATE_SERVICE); + SC_HANDLE serviceControlMgr = OpenSCManager(0, 0, SC_MANAGER_CREATE_SERVICE); - if (serviceControlManager) + if (serviceControlMgr) { char path[_MAX_PATH + 10]; if (GetModuleFileName( 0, path, sizeof(path) / sizeof(path[0]) ) > 0) { SC_HANDLE service; std::strcat(path, " --service"); - service = CreateService(serviceControlManager, + service = CreateService(serviceControlMgr, serviceName, // name of service serviceLongName, // service name to display SERVICE_ALL_ACCESS, // desired access @@ -64,7 +64,7 @@ bool WinServiceInstall() if (!advapi32) { CloseServiceHandle(service); - CloseServiceHandle(serviceControlManager); + CloseServiceHandle(serviceControlMgr); return false; } @@ -72,7 +72,7 @@ bool WinServiceInstall() if (!ChangeService_Config2) { CloseServiceHandle(service); - CloseServiceHandle(serviceControlManager); + CloseServiceHandle(serviceControlMgr); return false; } @@ -99,18 +99,18 @@ bool WinServiceInstall() CloseServiceHandle(service); } } - CloseServiceHandle(serviceControlManager); + CloseServiceHandle(serviceControlMgr); } return true; } bool WinServiceUninstall() { - SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CONNECT); + SC_HANDLE serviceControlMgr = OpenSCManager(0, 0, SC_MANAGER_CONNECT); - if (serviceControlManager) + if (serviceControlMgr) { - SC_HANDLE service = OpenService(serviceControlManager, + SC_HANDLE service = OpenService(serviceControlMgr, serviceName, SERVICE_QUERY_STATUS | DELETE); if (service) { @@ -125,7 +125,7 @@ bool WinServiceUninstall() CloseServiceHandle(service); } - CloseServiceHandle(serviceControlManager); + CloseServiceHandle(serviceControlMgr); } return true; } diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index 87ed9fe6a..357cb943d 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -59,7 +59,7 @@ void PetAI::_stopAttack() me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MoveIdle(); me->CombatStop(); - me->getHostileRefManager().deleteReferences(); + me->getHostileRefMgr().deleteReferences(); return; } diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index caa69cd9a..a5b462214 100644 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -99,7 +99,7 @@ void UnitAI::DoAddAuraToAllHostilePlayers(uint32 spellid) { if (me->IsInCombat()) { - ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType threatlist = me->getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) { if (Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid())) @@ -113,7 +113,7 @@ void UnitAI::DoCastToAllHostilePlayers(uint32 spellid, bool triggered) { if (me->IsInCombat()) { - ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType threatlist = me->getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) { if (Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid())) diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 107c2a87a..35d39668a 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -193,7 +193,7 @@ public: // predicate shall extend Acore::unary_function template Unit* SelectTarget(SelectAggroTarget targetType, uint32 position, PREDICATE const& predicate) { - ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& threatlist = me->getThreatMgr().getThreatList(); if (position >= threatlist.size()) return nullptr; @@ -243,7 +243,7 @@ public: // predicate shall extend Acore::unary_function template void SelectTargetList(std::list& targetList, PREDICATE const& predicate, uint32 maxTargets, SelectAggroTarget targetType) { - ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& threatlist = me->getThreatMgr().getThreatList(); if (threatlist.empty()) return; diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 91afb98e3..6aada410e 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -54,8 +54,8 @@ void CreatureAI::DoZoneInCombat(Creature* creature /*= nullptr*/, float maxRange if (Unit* summoner = creature->ToTempSummon()->GetSummonerUnit()) { Unit* target = summoner->getAttackerForHelper(); - if (!target && summoner->CanHaveThreatList() && !summoner->getThreatManager().isThreatListEmpty()) - target = summoner->getThreatManager().getHostilTarget(); + if (!target && summoner->CanHaveThreatList() && !summoner->getThreatMgr().isThreatListEmpty()) + target = summoner->getThreatMgr().getHostilTarget(); if (target && (creature->IsFriendlyTo(summoner) || creature->IsHostileTo(target))) creature->AI()->AttackStart(target); } @@ -223,7 +223,7 @@ bool CreatureAI::UpdateVictim() // xinef: if we have any victim, just return true else if (me->GetVictim() && me->GetExactDist(me->GetVictim()) < 30.0f) return true; - else if (me->getThreatManager().isThreatListEmpty()) + else if (me->getThreatMgr().isThreatListEmpty()) { EnterEvadeMode(); return false; diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 6f560e864..6991e0763 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -327,27 +327,27 @@ SpellInfo const* ScriptedAI::SelectSpell(Unit* target, uint32 school, uint32 mec void ScriptedAI::DoResetThreat() { - if (!me->CanHaveThreatList() || me->getThreatManager().isThreatListEmpty()) + if (!me->CanHaveThreatList() || me->getThreatMgr().isThreatListEmpty()) { LOG_ERROR("entities.unit.ai", "DoResetThreat called for creature that either cannot have threat list or has empty threat list (me entry = %d)", me->GetEntry()); return; } - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); } float ScriptedAI::DoGetThreat(Unit* unit) { if (!unit) return 0.0f; - return me->getThreatManager().getThreat(unit); + return me->getThreatMgr().getThreat(unit); } void ScriptedAI::DoModifyThreatPercent(Unit* unit, int32 pct) { if (!unit) return; - me->getThreatManager().modifyThreatPercent(unit, pct); + me->getThreatMgr().modifyThreatPercent(unit, pct); } void ScriptedAI::DoTeleportPlayer(Unit* unit, float x, float y, float z, float o) @@ -536,7 +536,7 @@ void BossAI::TeleportCheaters() float x, y, z; me->GetPosition(x, y, z); - ThreatContainer::StorageType threatList = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType threatList = me->getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr) if (Unit* target = (*itr)->getTarget()) if (target->GetTypeId() == TYPEID_PLAYER && !CheckBoundary(target)) diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index e2f049f84..2d8112355 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -619,12 +619,12 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u if (!me) break; - ThreatContainer::StorageType threatList = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType threatList = me->getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator i = threatList.begin(); i != threatList.end(); ++i) { if (Unit* target = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid())) { - me->getThreatManager().modifyThreatPercent(target, e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC); + me->getThreatMgr().modifyThreatPercent(target, e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC); LOG_DEBUG("sql.sql", "SmartScript::ProcessAction:: SMART_ACTION_THREAT_ALL_PCT: Creature %s modify threat for unit %s, value %i", me->GetGUID().ToString().c_str(), target->GetGUID().ToString().c_str(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC); } @@ -644,7 +644,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u { if (IsUnit(*itr)) { - me->getThreatManager().modifyThreatPercent((*itr)->ToUnit(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC); + me->getThreatMgr().modifyThreatPercent((*itr)->ToUnit(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC); LOG_DEBUG("sql.sql", "SmartScript::ProcessAction:: SMART_ACTION_THREAT_SINGLE_PCT: Creature %s modify threat for unit %s, value %i", me->GetGUID().ToString().c_str(), (*itr)->GetGUID().ToString().c_str(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC); } @@ -3662,7 +3662,7 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /* { if (me) { - ThreatContainer::StorageType threatList = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType threatList = me->getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator i = threatList.begin(); i != threatList.end(); ++i) if (Unit* temp = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid())) // Xinef: added distance check diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 5bdc18a4a..9bce75c7c 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -23,7 +23,7 @@ #include "InstanceScript.h" #include "Language.h" #include "Map.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Player.h" #include "ReputationMgr.h" diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index 13ca27314..2dce8dd7e 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -14,7 +14,7 @@ #include "Group.h" #include "GroupMgr.h" #include "Map.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Transport.h" diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index 843d23f91..631f0ab58 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -9,7 +9,7 @@ // TODO: Add proper implement of achievement #include "BattlefieldWG.h" -#include "MapManager.h" +#include "MapMgr.h" #include "Opcodes.h" #include "Player.h" #include "SpellAuras.h" diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp index e91f87363..63b559025 100644 --- a/src/server/game/Battlegrounds/Battleground.cpp +++ b/src/server/game/Battlegrounds/Battleground.cpp @@ -20,7 +20,7 @@ #include "GameGraveyard.h" #include "GridNotifiersImpl.h" #include "Group.h" -#include "MapManager.h" +#include "MapMgr.h" #include "Object.h" #include "ObjectMgr.h" #include "Pet.h" @@ -946,7 +946,7 @@ void Battleground::EndBattleground(TeamId winnerTeamId) { //needed cause else in av some creatures will kill the players at the end player->CombatStop(); - player->getHostileRefManager().deleteReferences(); + player->getHostileRefMgr().deleteReferences(); } // per player calculation diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 286ab3d66..0fa7e0500 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -27,7 +27,7 @@ #include "GameGraveyard.h" #include "Map.h" #include "MapInstanced.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Opcodes.h" #include "Player.h" diff --git a/src/server/game/Combat/HostileRefManager.cpp b/src/server/game/Combat/HostileRefMgr.cpp similarity index 85% rename from src/server/game/Combat/HostileRefManager.cpp rename to src/server/game/Combat/HostileRefMgr.cpp index 48e8dc269..957bbce19 100644 --- a/src/server/game/Combat/HostileRefManager.cpp +++ b/src/server/game/Combat/HostileRefMgr.cpp @@ -4,13 +4,13 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "HostileRefManager.h" +#include "HostileRefMgr.h" #include "SpellInfo.h" #include "SpellMgr.h" -#include "ThreatManager.h" +#include "ThreatMgr.h" #include "Unit.h" -HostileRefManager::~HostileRefManager() +HostileRefMgr::~HostileRefMgr() { deleteReferences(); } @@ -20,7 +20,7 @@ HostileRefManager::~HostileRefManager() // The victim is hated than by them as well // use for buffs and healing threat functionality -void HostileRefManager::threatAssist(Unit* victim, float baseThreat, SpellInfo const* threatSpell) +void HostileRefMgr::threatAssist(Unit* victim, float baseThreat, SpellInfo const* threatSpell) { if (getSize() == 0) return; @@ -39,7 +39,7 @@ void HostileRefManager::threatAssist(Unit* victim, float baseThreat, SpellInfo c //================================================= -void HostileRefManager::addTempThreat(float threat, bool apply) +void HostileRefMgr::addTempThreat(float threat, bool apply) { HostileReference* ref = getFirst(); @@ -59,7 +59,7 @@ void HostileRefManager::addTempThreat(float threat, bool apply) //================================================= -void HostileRefManager::addThreatPercent(int32 percent) +void HostileRefMgr::addThreatPercent(int32 percent) { HostileReference* ref = getFirst(); while (ref) @@ -72,7 +72,7 @@ void HostileRefManager::addThreatPercent(int32 percent) //================================================= // The online / offline status is given to the method. The calculation has to be done before -void HostileRefManager::setOnlineOfflineState(bool isOnline) +void HostileRefMgr::setOnlineOfflineState(bool isOnline) { HostileReference* ref = getFirst(); while (ref) @@ -85,7 +85,7 @@ void HostileRefManager::setOnlineOfflineState(bool isOnline) //================================================= // The online / offline status is calculated and set -void HostileRefManager::updateThreatTables() +void HostileRefMgr::updateThreatTables() { HostileReference* ref = getFirst(); while (ref) @@ -99,7 +99,7 @@ void HostileRefManager::updateThreatTables() // The references are not needed anymore // tell the source to remove them from the list and free the mem -void HostileRefManager::deleteReferences() +void HostileRefMgr::deleteReferences() { HostileReference* ref = getFirst(); while (ref) @@ -114,7 +114,7 @@ void HostileRefManager::deleteReferences() //================================================= // delete one reference, defined by faction -void HostileRefManager::deleteReferencesForFaction(uint32 faction) +void HostileRefMgr::deleteReferencesForFaction(uint32 faction) { HostileReference* ref = getFirst(); while (ref) @@ -132,7 +132,7 @@ void HostileRefManager::deleteReferencesForFaction(uint32 faction) //================================================= // delete one reference, defined by Unit -void HostileRefManager::deleteReference(Unit* creature) +void HostileRefMgr::deleteReference(Unit* creature) { HostileReference* ref = getFirst(); while (ref) @@ -151,7 +151,7 @@ void HostileRefManager::deleteReference(Unit* creature) //================================================= // delete all references out of specified range -void HostileRefManager::deleteReferencesOutOfRange(float range) +void HostileRefMgr::deleteReferencesOutOfRange(float range) { HostileReference* ref = getFirst(); range = range * range; @@ -171,7 +171,7 @@ void HostileRefManager::deleteReferencesOutOfRange(float range) //================================================= // set state for one reference, defined by Unit -void HostileRefManager::setOnlineOfflineState(Unit* creature, bool isOnline) +void HostileRefMgr::setOnlineOfflineState(Unit* creature, bool isOnline) { HostileReference* ref = getFirst(); while (ref) @@ -188,7 +188,7 @@ void HostileRefManager::setOnlineOfflineState(Unit* creature, bool isOnline) //================================================= -void HostileRefManager::UpdateVisibility(bool checkThreat) +void HostileRefMgr::UpdateVisibility(bool checkThreat) { HostileReference* ref = getFirst(); while (ref) diff --git a/src/server/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefMgr.h similarity index 87% rename from src/server/game/Combat/HostileRefManager.h rename to src/server/game/Combat/HostileRefMgr.h index 137bfc9bc..784ee916f 100644 --- a/src/server/game/Combat/HostileRefManager.h +++ b/src/server/game/Combat/HostileRefMgr.h @@ -8,22 +8,22 @@ #define _HOSTILEREFMANAGER #include "Common.h" -#include "RefManager.h" +#include "RefMgr.h" class Unit; -class ThreatManager; +class ThreatMgr; class HostileReference; class SpellInfo; //================================================= -class HostileRefManager : public RefManager +class HostileRefMgr : public RefMgr { private: Unit* iOwner; public: - explicit HostileRefManager(Unit* owner) { iOwner = owner; } - ~HostileRefManager() override; + explicit HostileRefMgr(Unit* owner) { iOwner = owner; } + ~HostileRefMgr() override; Unit* GetOwner() { return iOwner; } @@ -46,7 +46,7 @@ public: // pussywizard: for combat bugs void deleteReferencesOutOfRange(float range); - HostileReference* getFirst() { return ((HostileReference*) RefManager::getFirst()); } + HostileReference* getFirst() { return ((HostileReference*) RefMgr::getFirst()); } void updateThreatTables(); diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatMgr.cpp similarity index 93% rename from src/server/game/Combat/ThreatManager.cpp rename to src/server/game/Combat/ThreatMgr.cpp index 9caa799b0..4a63805c4 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatMgr.cpp @@ -12,7 +12,7 @@ #include "SpellAuras.h" #include "SpellInfo.h" #include "SpellMgr.h" -#include "ThreatManager.h" +#include "ThreatMgr.h" #include "Unit.h" #include "UnitEvents.h" @@ -80,11 +80,11 @@ bool ThreatCalcHelper::isValidProcess(Unit* hatedUnit, Unit* hatingUnit, SpellIn //================= HostileReference ========================== //============================================================ -HostileReference::HostileReference(Unit* refUnit, ThreatManager* threatManager, float threat) +HostileReference::HostileReference(Unit* refUnit, ThreatMgr* threatMgr, float threat) { iThreat = threat; iTempThreatModifier = 0.0f; - link(refUnit, threatManager); + link(refUnit, threatMgr); iUnitGuid = refUnit->GetGUID(); iOnline = true; } @@ -382,16 +382,16 @@ HostileReference* ThreatContainer::selectNextVictim(Creature* attacker, HostileR } //============================================================ -//=================== ThreatManager ========================== +//=================== ThreatMgr ========================== //============================================================ -ThreatManager::ThreatManager(Unit* owner) : iCurrentVictim(nullptr), iOwner(owner), iUpdateTimer(THREAT_UPDATE_INTERVAL) +ThreatMgr::ThreatMgr(Unit* owner) : iCurrentVictim(nullptr), iOwner(owner), iUpdateTimer(THREAT_UPDATE_INTERVAL) { } //============================================================ -void ThreatManager::clearReferences() +void ThreatMgr::clearReferences() { iThreatContainer.clearReferences(); iThreatOfflineContainer.clearReferences(); @@ -401,7 +401,7 @@ void ThreatManager::clearReferences() //============================================================ -void ThreatManager::addThreat(Unit* victim, float threat, SpellSchoolMask schoolMask, SpellInfo const* threatSpell) +void ThreatMgr::addThreat(Unit* victim, float threat, SpellSchoolMask schoolMask, SpellInfo const* threatSpell) { if (!ThreatCalcHelper::isValidProcess(victim, GetOwner(), threatSpell)) return; @@ -409,7 +409,7 @@ void ThreatManager::addThreat(Unit* victim, float threat, SpellSchoolMask school doAddThreat(victim, ThreatCalcHelper::calcThreat(victim, iOwner, threat, schoolMask, threatSpell)); } -void ThreatManager::doAddThreat(Unit* victim, float threat) +void ThreatMgr::doAddThreat(Unit* victim, float threat) { uint32 redirectThreadPct = victim->GetRedirectThreatPercent(); @@ -428,7 +428,7 @@ void ThreatManager::doAddThreat(Unit* victim, float threat) _addThreat(victim, threat); } -void ThreatManager::_addThreat(Unit* victim, float threat) +void ThreatMgr::_addThreat(Unit* victim, float threat) { HostileReference* ref = iThreatContainer.addThreat(victim, threat); // Ref is not in the online refs, search the offline refs next @@ -448,14 +448,14 @@ void ThreatManager::_addThreat(Unit* victim, float threat) //============================================================ -void ThreatManager::modifyThreatPercent(Unit* victim, int32 percent) +void ThreatMgr::modifyThreatPercent(Unit* victim, int32 percent) { iThreatContainer.modifyThreatPercent(victim, percent); } //============================================================ -Unit* ThreatManager::getHostilTarget() +Unit* ThreatMgr::getHostilTarget() { iThreatContainer.update(); HostileReference* nextVictim = iThreatContainer.selectNextVictim(GetOwner()->ToCreature(), getCurrentVictim()); @@ -465,7 +465,7 @@ Unit* ThreatManager::getHostilTarget() //============================================================ -float ThreatManager::getThreat(Unit* victim, bool alsoSearchOfflineList) +float ThreatMgr::getThreat(Unit* victim, bool alsoSearchOfflineList) { float threat = 0.0f; HostileReference* ref = iThreatContainer.getReferenceByTarget(victim); @@ -478,7 +478,7 @@ float ThreatManager::getThreat(Unit* victim, bool alsoSearchOfflineList) //============================================================ -float ThreatManager::getThreatWithoutTemp(Unit* victim, bool alsoSearchOfflineList) +float ThreatMgr::getThreatWithoutTemp(Unit* victim, bool alsoSearchOfflineList) { float threat = 0.0f; HostileReference* ref = iThreatContainer.getReferenceByTarget(victim); @@ -491,7 +491,7 @@ float ThreatManager::getThreatWithoutTemp(Unit* victim, bool alsoSearchOfflineLi //============================================================ -void ThreatManager::tauntApply(Unit* taunter) +void ThreatMgr::tauntApply(Unit* taunter) { HostileReference* ref = iThreatContainer.getReferenceByTarget(taunter); if (getCurrentVictim() && ref && (ref->getThreat() < getCurrentVictim()->getThreat())) @@ -503,7 +503,7 @@ void ThreatManager::tauntApply(Unit* taunter) //============================================================ -void ThreatManager::tauntFadeOut(Unit* taunter) +void ThreatMgr::tauntFadeOut(Unit* taunter) { HostileReference* ref = iThreatContainer.getReferenceByTarget(taunter); if (ref) @@ -512,7 +512,7 @@ void ThreatManager::tauntFadeOut(Unit* taunter) //============================================================ -void ThreatManager::setCurrentVictim(HostileReference* pHostileReference) +void ThreatMgr::setCurrentVictim(HostileReference* pHostileReference) { if (pHostileReference && pHostileReference != iCurrentVictim) { @@ -525,9 +525,9 @@ void ThreatManager::setCurrentVictim(HostileReference* pHostileReference) // The hated unit is gone, dead or deleted // return true, if the event is consumed -void ThreatManager::processThreatEvent(ThreatRefStatusChangeEvent* threatRefStatusChangeEvent) +void ThreatMgr::processThreatEvent(ThreatRefStatusChangeEvent* threatRefStatusChangeEvent) { - threatRefStatusChangeEvent->setThreatManager(this); // now we can set the threat manager + threatRefStatusChangeEvent->setThreatMgr(this); // now we can set the threat manager HostileReference* hostilRef = threatRefStatusChangeEvent->getReference(); @@ -576,7 +576,7 @@ void ThreatManager::processThreatEvent(ThreatRefStatusChangeEvent* threatRefStat } } -bool ThreatManager::isNeedUpdateToClient(uint32 time) +bool ThreatMgr::isNeedUpdateToClient(uint32 time) { if (isThreatListEmpty()) return false; @@ -591,7 +591,7 @@ bool ThreatManager::isNeedUpdateToClient(uint32 time) } // Reset all aggro without modifying the threatlist. -void ThreatManager::resetAllAggro() +void ThreatMgr::resetAllAggro() { ThreatContainer::StorageType& threatList = iThreatContainer.iThreatList; if (threatList.empty()) diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatMgr.h similarity index 95% rename from src/server/game/Combat/ThreatManager.h rename to src/server/game/Combat/ThreatMgr.h index 44f578688..d56a65e54 100644 --- a/src/server/game/Combat/ThreatManager.h +++ b/src/server/game/Combat/ThreatMgr.h @@ -17,7 +17,7 @@ class Unit; class Creature; -class ThreatManager; +class ThreatMgr; class SpellInfo; #define THREAT_UPDATE_INTERVAL 2 * IN_MILLISECONDS // Server should send threat update to client periodically each second @@ -32,10 +32,10 @@ struct ThreatCalcHelper }; //============================================================== -class HostileReference : public Reference +class HostileReference : public Reference { public: - HostileReference(Unit* refUnit, ThreatManager* threatManager, float threat); + HostileReference(Unit* refUnit, ThreatMgr* threatMgr, float threat); //================================================= void addThreat(float modThreat); @@ -93,7 +93,7 @@ public: //================================================= - HostileReference* next() { return ((HostileReference*) Reference::next()); } + HostileReference* next() { return ((HostileReference*) Reference::next()); } //================================================= @@ -118,11 +118,11 @@ private: }; //============================================================== -class ThreatManager; +class ThreatMgr; class ThreatContainer { - friend class ThreatManager; + friend class ThreatMgr; public: typedef std::list StorageType; @@ -177,14 +177,14 @@ private: //================================================= -class ThreatManager +class ThreatMgr { public: friend class HostileReference; - explicit ThreatManager(Unit* owner); + explicit ThreatMgr(Unit* owner); - ~ThreatManager() { clearReferences(); } + ~ThreatMgr() { clearReferences(); } void clearReferences(); diff --git a/src/server/game/Combat/UnitEvents.h b/src/server/game/Combat/UnitEvents.h index 10e69986e..dd47a185f 100644 --- a/src/server/game/Combat/UnitEvents.h +++ b/src/server/game/Combat/UnitEvents.h @@ -10,7 +10,7 @@ #include "Common.h" class ThreatContainer; -class ThreatManager; +class ThreatMgr; class HostileReference; //============================================================== @@ -79,15 +79,15 @@ private: int32 iIValue; bool iBValue; }; - ThreatManager* iThreatManager; + ThreatMgr* iThreatMgr; public: - ThreatRefStatusChangeEvent(uint32 pType) : UnitBaseEvent(pType), iThreatManager(nullptr) { iHostileReference = nullptr; } + ThreatRefStatusChangeEvent(uint32 pType) : UnitBaseEvent(pType), iThreatMgr(nullptr) { iHostileReference = nullptr; } - ThreatRefStatusChangeEvent(uint32 pType, HostileReference* pHostileReference) : UnitBaseEvent(pType), iThreatManager(nullptr) { iHostileReference = pHostileReference; } + ThreatRefStatusChangeEvent(uint32 pType, HostileReference* pHostileReference) : UnitBaseEvent(pType), iThreatMgr(nullptr) { iHostileReference = pHostileReference; } - ThreatRefStatusChangeEvent(uint32 pType, HostileReference* pHostileReference, float pValue) : UnitBaseEvent(pType), iThreatManager(nullptr) { iHostileReference = pHostileReference; iFValue = pValue; } + ThreatRefStatusChangeEvent(uint32 pType, HostileReference* pHostileReference, float pValue) : UnitBaseEvent(pType), iThreatMgr(nullptr) { iHostileReference = pHostileReference; iFValue = pValue; } - ThreatRefStatusChangeEvent(uint32 pType, HostileReference* pHostileReference, bool pValue) : UnitBaseEvent(pType), iThreatManager(nullptr) { iHostileReference = pHostileReference; iBValue = pValue; } + ThreatRefStatusChangeEvent(uint32 pType, HostileReference* pHostileReference, bool pValue) : UnitBaseEvent(pType), iThreatMgr(nullptr) { iHostileReference = pHostileReference; iBValue = pValue; } [[nodiscard]] int32 getIValue() const { return iIValue; } @@ -99,20 +99,20 @@ public: [[nodiscard]] HostileReference* getReference() const { return iHostileReference; } - void setThreatManager(ThreatManager* pThreatManager) { iThreatManager = pThreatManager; } + void setThreatMgr(ThreatMgr* pThreatMgr) { iThreatMgr = pThreatMgr; } - [[nodiscard]] ThreatManager* getThreatManager() const { return iThreatManager; } + [[nodiscard]] ThreatMgr* getThreatMgr() const { return iThreatMgr; } }; //============================================================== -class ThreatManagerEvent : public ThreatRefStatusChangeEvent +class ThreatMgrEvent : public ThreatRefStatusChangeEvent { private: ThreatContainer* iThreatContainer; public: - ThreatManagerEvent(uint32 pType) : ThreatRefStatusChangeEvent(pType), iThreatContainer(nullptr) {} - ThreatManagerEvent(uint32 pType, HostileReference* pHostileReference) : ThreatRefStatusChangeEvent(pType, pHostileReference), iThreatContainer(nullptr) {} + ThreatMgrEvent(uint32 pType) : ThreatRefStatusChangeEvent(pType), iThreatContainer(nullptr) {} + ThreatMgrEvent(uint32 pType, HostileReference* pHostileReference) : ThreatRefStatusChangeEvent(pType, pHostileReference), iThreatContainer(nullptr) {} void setThreatContainer(ThreatContainer* pThreatContainer) { iThreatContainer = pThreatContainer; } diff --git a/src/server/game/Conditions/DisableMgr.h b/src/server/game/Conditions/DisableMgr.h index 92c35d8c4..11d0a6a52 100644 --- a/src/server/game/Conditions/DisableMgr.h +++ b/src/server/game/Conditions/DisableMgr.h @@ -9,7 +9,7 @@ #include "Define.h" #include "Map.h" -#include "VMapManager2.h" +#include "VMapMgr2.h" class Unit; diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 0c1c05e3f..4e3ec0972 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -20,7 +20,7 @@ #include "InstanceScript.h" #include "Log.h" #include "LootMgr.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Opcodes.h" #include "OutdoorPvPMgr.h" diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 0b8db265f..8caa3b726 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -14,7 +14,7 @@ #include "DynamicVisibility.h" #include "GridNotifiers.h" #include "Log.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MovementPacketBuilder.h" #include "Object.h" #include "ObjectAccessor.h" @@ -2996,7 +2996,7 @@ struct WorldObjectChangeAccumulator } } - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; void WorldObject::BuildUpdate(UpdateDataMapType& data_map, UpdatePlayerSet& player_set) diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index be6f31d7c..2eb63abd3 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -708,7 +708,7 @@ class GridObject { public: [[nodiscard]] bool IsInGrid() const { return _gridRef.isValid(); } - void AddToGrid(GridRefManager& m) { ASSERT(!IsInGrid()); _gridRef.link(&m, (T*)this); } + void AddToGrid(GridRefMgr& m) { ASSERT(!IsInGrid()); _gridRef.link(&m, (T*)this); } void RemoveFromGrid() { ASSERT(IsInGrid()); _gridRef.unlink(); } private: GridReference _gridRef; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 572bc7481..33f3189c6 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -45,7 +45,7 @@ #include "Log.h" #include "LootItemStorage.h" #include "MapInstanced.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -1282,7 +1282,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati // for except kick by antispeedhack sScriptMgr->AnticheatSetSkipOnePacketForASH(this, true); - if (!MapManager::IsValidMapCoord(mapid, x, y, z, orientation)) + if (!MapMgr::IsValidMapCoord(mapid, x, y, z, orientation)) { LOG_ERROR("entities.player", "TeleportTo: invalid map (%d) or invalid coordinates (X: %f, Y: %f, Z: %f, O: %f) given when teleporting player (%s, name: %s, map: %d, X: %f, Y: %f, Z: %f, O: %f).", mapid, x, y, z, orientation, GetGUID().ToString().c_str(), GetName().c_str(), GetMapId(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); @@ -2097,7 +2097,7 @@ void Player::SetInWater(bool apply) // remove auras that need water/land RemoveAurasWithInterruptFlags(apply ? AURA_INTERRUPT_FLAG_NOT_ABOVEWATER : AURA_INTERRUPT_FLAG_NOT_UNDERWATER); - getHostileRefManager().updateThreatTables(); + getHostileRefMgr().updateThreatTables(); } bool Player::IsInAreaTriggerRadius(const AreaTrigger* trigger) const @@ -2138,13 +2138,13 @@ void Player::SetGameMaster(bool on) { if (AccountMgr::IsGMAccount(GetSession()->GetSecurity())) pet->setFaction(35); - pet->getHostileRefManager().setOnlineOfflineState(false); + pet->getHostileRefMgr().setOnlineOfflineState(false); } RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP); ResetContestedPvP(); - getHostileRefManager().setOnlineOfflineState(false); + getHostileRefMgr().setOnlineOfflineState(false); CombatStopWithPets(); SetPhaseMask(uint32(PHASEMASK_ANYWHERE), false); // see and visible in all phases @@ -2168,7 +2168,7 @@ void Player::SetGameMaster(bool on) if (Pet* pet = GetPet()) { pet->setFaction(getFaction()); - pet->getHostileRefManager().setOnlineOfflineState(true); + pet->getHostileRefMgr().setOnlineOfflineState(true); } // restore FFA PvP Server state @@ -2178,7 +2178,7 @@ void Player::SetGameMaster(bool on) // restore FFA PvP area state, remove not allowed for GM mounts UpdateArea(m_areaUpdateId); - getHostileRefManager().setOnlineOfflineState(true); + getHostileRefMgr().setOnlineOfflineState(true); m_serverSideVisibilityDetect.SetValue(SERVERSIDE_VISIBILITY_GM, SEC_PLAYER); } @@ -9649,7 +9649,7 @@ void Player::CleanupAfterTaxiFlight() m_taxi.ClearTaxiDestinations(); // not destinations, clear source node Dismount(); RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT); - getHostileRefManager().setOnlineOfflineState(true); + getHostileRefMgr().setOnlineOfflineState(true); } void Player::ContinueTaxiFlight() @@ -13674,7 +13674,7 @@ void Player::ResetMap() // this may be called during Map::Update // after decrement+unlink, ++m_mapRefIter will continue correctly // when the first element of the list is being removed - // nocheck_prev will return the padding element of the RefManager + // nocheck_prev will return the padding element of the RefMgr // instead of nullptr in the case of prev GetMap()->UpdateIteratorBack(this); Unit::ResetMap(); diff --git a/src/server/game/Entities/Player/PlayerMisc.cpp b/src/server/game/Entities/Player/PlayerMisc.cpp index df4795d39..d236f5855 100644 --- a/src/server/game/Entities/Player/PlayerMisc.cpp +++ b/src/server/game/Entities/Player/PlayerMisc.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "MapManager.h" +#include "MapMgr.h" #include "Player.h" #include "ScriptMgr.h" diff --git a/src/server/game/Entities/Player/PlayerQuest.cpp b/src/server/game/Entities/Player/PlayerQuest.cpp index fcd7de207..4d59eed70 100644 --- a/src/server/game/Entities/Player/PlayerQuest.cpp +++ b/src/server/game/Entities/Player/PlayerQuest.cpp @@ -8,7 +8,7 @@ #include "DisableMgr.h" #include "GameObjectAI.h" #include "Group.h" -#include "MapManager.h" +#include "MapMgr.h" #include "Player.h" #include "PoolMgr.h" #include "ReputationMgr.h" diff --git a/src/server/game/Entities/Player/PlayerStorage.cpp b/src/server/game/Entities/Player/PlayerStorage.cpp index c552df277..2948a14e2 100644 --- a/src/server/game/Entities/Player/PlayerStorage.cpp +++ b/src/server/game/Entities/Player/PlayerStorage.cpp @@ -36,7 +36,7 @@ #include "LFGMgr.h" #include "Log.h" #include "LootItemStorage.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -7032,7 +7032,7 @@ bool Player::_LoadHomeBind(PreparedQueryResult result) MapEntry const* bindMapEntry = sMapStore.LookupEntry(m_homebindMapId); // accept saved data only for valid position (and non instanceable), and accessable - if (MapManager::IsValidMapCoord(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ) && + if (MapMgr::IsValidMapCoord(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ) && !bindMapEntry->Instanceable() && GetSession()->Expansion() >= bindMapEntry->Expansion()) ok = true; else diff --git a/src/server/game/Entities/Player/PlayerUpdates.cpp b/src/server/game/Entities/Player/PlayerUpdates.cpp index a4db1a5e8..5fe3eb63e 100644 --- a/src/server/game/Entities/Player/PlayerUpdates.cpp +++ b/src/server/game/Entities/Player/PlayerUpdates.cpp @@ -397,7 +397,7 @@ void Player::Update(uint32 p_time) { m_hostileReferenceCheckTimer = 15000; if (!GetMap()->IsDungeon()) - getHostileRefManager().deleteReferencesOutOfRange( + getHostileRefMgr().deleteReferencesOutOfRange( GetVisibilityRange()); } else diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index 05ee67870..4970b2fb1 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -9,7 +9,7 @@ #include "Common.h" #include "DBCStores.h" #include "GameObjectAI.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MapReference.h" #include "ObjectMgr.h" #include "Player.h" diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6dd48cb29..4279d2d4b 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -24,7 +24,7 @@ #include "InstanceSaveMgr.h" #include "InstanceScript.h" #include "Log.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MoveSpline.h" #include "MoveSplineInit.h" #include "ObjectAccessor.h" @@ -184,11 +184,11 @@ Unit::Unit(bool isWorldObject) : WorldObject(isWorldObject), m_removedAurasCount(0), i_motionMaster(new MotionMaster(this)), m_regenTimer(0), - m_ThreatManager(this), + m_ThreatMgr(this), m_vehicle(nullptr), m_vehicleKit(nullptr), m_unitTypeMask(UNIT_MASK_NONE), - m_HostileRefManager(this), + m_HostileRefMgr(this), m_comboTarget(nullptr) { #ifdef _MSC_VER @@ -400,7 +400,7 @@ void Unit::Update(uint32 p_time) _UpdateSpells( p_time ); - if (CanHaveThreatList() && getThreatManager().isNeedUpdateToClient(p_time)) + if (CanHaveThreatList() && getThreatMgr().isNeedUpdateToClient(p_time)) SendThreatListUpdate(); // update combat timer only for players and pets (only pets with PetAI) @@ -409,7 +409,7 @@ void Unit::Update(uint32 p_time) // Check UNIT_STATE_MELEE_ATTACKING or UNIT_STATE_CHASE (without UNIT_STATE_FOLLOW in this case) so pets can reach far away // targets without stopping half way there and running off. // These flags are reset after target dies or another command is given. - if (m_HostileRefManager.isEmpty()) + if (m_HostileRefMgr.isEmpty()) { // m_CombatTimer set at aura start and it will be freeze until aura removing if (m_CombatTimer <= p_time) @@ -8671,7 +8671,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg return false; if (victim && victim->IsAlive()) - victim->getThreatManager().modifyThreatPercent(this, -10); + victim->getThreatMgr().modifyThreatPercent(this, -10); basepoints0 = int32(CountPctFromMaxHealth(triggerAmount)); trigger_spell_id = 31616; @@ -10549,7 +10549,7 @@ void Unit::EnergizeBySpell(Unit* victim, uint32 spellID, uint32 damage, Powers p if (powerType != POWER_HAPPINESS) { SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellID); - victim->getHostileRefManager().threatAssist(this, float(damage) * 0.5f, spellInfo); + victim->getHostileRefMgr().threatAssist(this, float(damage) * 0.5f, spellInfo); } } @@ -13577,7 +13577,7 @@ void Unit::setDeathState(DeathState s, bool despawn) { CombatStop(); DeleteThreatList(); - getHostileRefManager().deleteReferences(); + getHostileRefMgr().deleteReferences(); ClearComboPointHolders(); // any combo points pointed to unit lost at it death if (IsNonMeleeSpellCast(false)) @@ -13674,7 +13674,7 @@ void Unit::AddThreat(Unit* victim, float fThreat, SpellSchoolMask schoolMask, Sp // Only mobs can manage threat lists if (CanHaveThreatList() && !HasUnitState(UNIT_STATE_EVADE)) { - m_ThreatManager.addThreat(victim, fThreat, schoolMask, threatSpell); + m_ThreatMgr.addThreat(victim, fThreat, schoolMask, threatSpell); } } @@ -13682,9 +13682,9 @@ void Unit::AddThreat(Unit* victim, float fThreat, SpellSchoolMask schoolMask, Sp void Unit::DeleteThreatList() { - if (CanHaveThreatList() && !m_ThreatManager.isThreatListEmpty()) + if (CanHaveThreatList() && !m_ThreatMgr.isThreatListEmpty()) SendClearThreatListOpcode(); - m_ThreatManager.clearReferences(); + m_ThreatMgr.clearReferences(); } //====================================================================== @@ -13712,7 +13712,7 @@ void Unit::TauntApply(Unit* taunter) if (creature->IsAIEnabled) creature->AI()->AttackStart(taunter); - //m_ThreatManager.tauntApply(taunter); + //m_ThreatMgr.tauntApply(taunter); } //====================================================================== @@ -13736,7 +13736,7 @@ void Unit::TauntFadeOut(Unit* taunter) if (!target || target != taunter) return; - if (m_ThreatManager.isThreatListEmpty()) + if (m_ThreatMgr.isThreatListEmpty()) { if (creature->IsAIEnabled) creature->AI()->EnterEvadeMode(); @@ -13776,8 +13776,8 @@ Unit* Creature::SelectVictim() if (CanHaveThreatList()) { - if (!target && !m_ThreatManager.isThreatListEmpty()) - target = m_ThreatManager.getHostilTarget(); + if (!target && !m_ThreatMgr.isThreatListEmpty()) + target = m_ThreatMgr.getHostilTarget(); } else if (!HasReactState(REACT_PASSIVE)) { @@ -14740,7 +14740,7 @@ void Unit::CleanupBeforeRemoveFromMap(bool finalCleanup) CombatStop(); ClearComboPointHolders(); DeleteThreatList(); - getHostileRefManager().deleteReferences(); + getHostileRefMgr().deleteReferences(); GetMotionMaster()->Clear(false); // remove different non-standard movement generators. } @@ -16882,7 +16882,7 @@ void Unit::Kill(Unit* killer, Unit* victim, bool durabilityLoss, WeaponAttackTyp // Stop attacks victim->CombatStop(); - victim->getHostileRefManager().deleteReferences(); + victim->getHostileRefMgr().deleteReferences(); // restore for use at real death victim->SetUInt32Value(PLAYER_SELF_RES_SPELL, ressSpellId); @@ -17537,7 +17537,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au _charmThreatInfo.clear(); // Xinef: move invalid threat / hostile references to offline lists - ThreatContainer::StorageType threatList = getThreatManager().getThreatList(); + ThreatContainer::StorageType threatList = getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr) if (Unit* target = (*itr)->getTarget()) _charmThreatInfo[target->GetGUID()] = (*itr)->getThreat() - (*itr)->getTempThreatModifier(); @@ -17588,7 +17588,7 @@ void Unit::RemoveCharmedBy(Unit* charmer) CastStop(); CombatStop(); - getHostileRefManager().deleteReferences(); + getHostileRefMgr().deleteReferences(); DeleteThreatList(); // xinef: update speed after charming @@ -18066,14 +18066,14 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update) // modify hostile references for new phasemask, some special cases deal with hostile references themselves if (GetTypeId() == TYPEID_UNIT || (!ToPlayer()->IsGameMaster() && !ToPlayer()->GetSession()->PlayerLogout())) { - HostileRefManager& refManager = getHostileRefManager(); - HostileReference* ref = refManager.getFirst(); + HostileRefMgr& refMgr = getHostileRefMgr(); + HostileReference* ref = refMgr.getFirst(); while (ref) { if (Unit* unit = ref->GetSource()->GetOwner()) if (Creature* creature = unit->ToCreature()) - refManager.setOnlineOfflineState(creature, creature->InSamePhase(newPhaseMask)); + refMgr.setOnlineOfflineState(creature, creature->InSamePhase(newPhaseMask)); ref = ref->next(); } @@ -18081,8 +18081,8 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update) // modify threat lists for new phasemask if (GetTypeId() != TYPEID_PLAYER) { - ThreatContainer::StorageType threatList = getThreatManager().getThreatList(); - ThreatContainer::StorageType offlineThreatList = getThreatManager().getOfflineThreatList(); + ThreatContainer::StorageType threatList = getThreatMgr().getThreatList(); + ThreatContainer::StorageType offlineThreatList = getThreatMgr().getOfflineThreatList(); // merge expects sorted lists threatList.sort(); @@ -18091,7 +18091,7 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update) for (ThreatContainer::StorageType::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr) if (Unit* unit = (*itr)->getTarget()) - unit->getHostileRefManager().setOnlineOfflineState(ToCreature(), unit->InSamePhase(newPhaseMask)); + unit->getHostileRefMgr().setOnlineOfflineState(ToCreature(), unit->InSamePhase(newPhaseMask)); } } } @@ -19021,15 +19021,15 @@ void Unit::UpdateHeight(float newZ) void Unit::SendThreatListUpdate() { - if (!getThreatManager().isThreatListEmpty()) + if (!getThreatMgr().isThreatListEmpty()) { - uint32 count = getThreatManager().getThreatList().size(); + uint32 count = getThreatMgr().getThreatList().size(); //LOG_DEBUG("entities.unit", "WORLD: Send SMSG_THREAT_UPDATE Message"); WorldPacket data(SMSG_THREAT_UPDATE, 8 + count * 8); data << GetPackGUID(); data << uint32(count); - ThreatContainer::StorageType const& tlist = getThreatManager().getThreatList(); + ThreatContainer::StorageType const& tlist = getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = tlist.begin(); itr != tlist.end(); ++itr) { data << (*itr)->getUnitGuid().WriteAsPacked(); @@ -19041,16 +19041,16 @@ void Unit::SendThreatListUpdate() void Unit::SendChangeCurrentVictimOpcode(HostileReference* pHostileReference) { - if (!getThreatManager().isThreatListEmpty()) + if (!getThreatMgr().isThreatListEmpty()) { - uint32 count = getThreatManager().getThreatList().size(); + uint32 count = getThreatMgr().getThreatList().size(); LOG_DEBUG("entities.unit", "WORLD: Send SMSG_HIGHEST_THREAT_UPDATE Message"); WorldPacket data(SMSG_HIGHEST_THREAT_UPDATE, 8 + 8 + count * 8); data << GetPackGUID(); data << pHostileReference->getUnitGuid().WriteAsPacked(); data << uint32(count); - ThreatContainer::StorageType const& tlist = getThreatManager().getThreatList(); + ThreatContainer::StorageType const& tlist = getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = tlist.begin(); itr != tlist.end(); ++itr) { data << (*itr)->getUnitGuid().WriteAsPacked(); @@ -19136,7 +19136,7 @@ void Unit::StopAttackFaction(uint32 faction_id) ++itr; } - getHostileRefManager().deleteReferencesForFaction(faction_id); + getHostileRefMgr().deleteReferencesForFaction(faction_id); for (ControlSet::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) (*itr)->StopAttackFaction(faction_id); @@ -19941,7 +19941,7 @@ bool Unit::IsInCombatWith(Unit const* who) const return false; // Search in threat list ObjectGuid guid = who->GetGUID(); - for (ThreatContainer::StorageType::const_iterator i = m_ThreatManager.getThreatList().begin(); i != m_ThreatManager.getThreatList().end(); ++i) + for (ThreatContainer::StorageType::const_iterator i = m_ThreatMgr.getThreatList().begin(); i != m_ThreatMgr.getThreatList().end(); ++i) { HostileReference* ref = (*i); // Return true if the unit matches diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index aed309b97..eab47bb63 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -9,12 +9,12 @@ #include "EventProcessor.h" #include "FollowerReference.h" -#include "FollowerRefManager.h" -#include "HostileRefManager.h" +#include "FollowerRefMgr.h" +#include "HostileRefMgr.h" #include "MotionMaster.h" #include "Object.h" #include "SpellAuraDefines.h" -#include "ThreatManager.h" +#include "ThreatMgr.h" #include #define WORLD_TRIGGER 12999 @@ -2203,10 +2203,10 @@ public: void DeleteThreatList(); void TauntApply(Unit* victim); void TauntFadeOut(Unit* taunter); - ThreatManager& getThreatManager() { return m_ThreatManager; } - void addHatedBy(HostileReference* pHostileReference) { m_HostileRefManager.insertFirst(pHostileReference); }; + ThreatMgr& getThreatMgr() { return m_ThreatMgr; } + void addHatedBy(HostileReference* pHostileReference) { m_HostileRefMgr.insertFirst(pHostileReference); }; void removeHatedBy(HostileReference* /*pHostileReference*/) { /* nothing to do yet */ } - HostileRefManager& getHostileRefManager() { return m_HostileRefManager; } + HostileRefMgr& getHostileRefMgr() { return m_HostileRefMgr; } VisibleAuraMap const* GetVisibleAuras() { return &m_visibleAuras; } AuraApplication* GetVisibleAura(uint8 slot) @@ -2312,7 +2312,7 @@ public: void ModSpellCastTime(SpellInfo const* spellProto, int32& castTime, Spell* spell = nullptr); float CalculateLevelPenalty(SpellInfo const* spellProto) const; - void addFollower(FollowerReference* pRef) { m_FollowingRefManager.insertFirst(pRef); } + void addFollower(FollowerReference* pRef) { m_FollowingRefMgr.insertFirst(pRef); } void removeFollower(FollowerReference* /*pRef*/) { /* nothing to do yet */ } MotionMaster* GetMotionMaster() { return i_motionMaster; } @@ -2554,7 +2554,7 @@ protected: uint32 m_reactiveTimer[MAX_REACTIVE]; int32 m_regenTimer; - ThreatManager m_ThreatManager; + ThreatMgr m_ThreatMgr; typedef std::map CharmThreatMap; CharmThreatMap _charmThreatInfo; @@ -2600,9 +2600,9 @@ private: Diminishing m_Diminishing; // Manage all Units that are threatened by us - HostileRefManager m_HostileRefManager; + HostileRefMgr m_HostileRefMgr; - FollowerRefManager m_FollowingRefManager; + FollowerRefMgr m_FollowingRefMgr; Unit* m_comboTarget; ComboPointHolderSet m_ComboPointHolders; diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 7e8665114..179ab84bf 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -10,7 +10,7 @@ #include "GossipDef.h" #include "Language.h" #include "Log.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Player.h" #include "PoolMgr.h" diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index 7ec143ef0..cee7fc273 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -13,7 +13,7 @@ #include "Log.h" #include "Map.h" #include "MapInstanced.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectDefines.h" #include "ObjectMgr.h" diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index a76772beb..e8d58799d 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -18,7 +18,7 @@ #include "Language.h" #include "LFGMgr.h" #include "Log.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Pet.h" #include "PoolMgr.h" @@ -33,7 +33,7 @@ #include "UpdateMask.h" #include "Util.h" #include "Vehicle.h" -#include "WaypointManager.h" +#include "WaypointMgr.h" #include "World.h" ScriptMapMap sSpellScripts; @@ -2242,7 +2242,7 @@ void ObjectMgr::LoadGameobjects() continue; } - if (!MapManager::IsValidMapCoord(data.mapid, data.posX, data.posY, data.posZ, data.orientation)) + if (!MapMgr::IsValidMapCoord(data.mapid, data.posX, data.posY, data.posZ, data.orientation)) { LOG_ERROR("sql.sql", "Table `gameobject` has gameobject (GUID: %u Entry: %u) with invalid coordinates, skip", guid, data.id); continue; @@ -3383,7 +3383,7 @@ void ObjectMgr::LoadPlayerInfo() } // accept DB data only for valid position (and non instanceable) - if (!MapManager::IsValidMapCoord(mapId, positionX, positionY, positionZ, orientation)) + if (!MapMgr::IsValidMapCoord(mapId, positionX, positionY, positionZ, orientation)) { LOG_ERROR("sql.sql", "Wrong home position for class %u race %u pair in `playercreateinfo` table, ignoring.", current_class, current_race); continue; @@ -5440,7 +5440,7 @@ void ObjectMgr::LoadInstanceTemplate() uint16 mapID = fields[0].GetUInt16(); - if (!MapManager::IsValidMAP(mapID, true)) + if (!MapMgr::IsValidMAP(mapID, true)) { LOG_ERROR("sql.sql", "ObjectMgr::LoadInstanceTemplate: bad mapid %d for template!", mapID); continue; @@ -8079,7 +8079,7 @@ void ObjectMgr::LoadGameTele() gt.mapId = fields[5].GetUInt16(); gt.name = fields[6].GetString(); - if (!MapManager::IsValidMapCoord(gt.mapId, gt.position_x, gt.position_y, gt.position_z, gt.orientation)) + if (!MapMgr::IsValidMapCoord(gt.mapId, gt.position_x, gt.position_y, gt.position_z, gt.orientation)) { LOG_ERROR("sql.sql", "Wrong position for id %u (name: %s) in `game_tele` table, ignoring.", id, gt.name.c_str()); continue; diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h index 1a01b1c1c..83453884b 100644 --- a/src/server/game/Grids/GridDefines.h +++ b/src/server/game/Grids/GridDefines.h @@ -47,11 +47,11 @@ typedef TYPELIST_5(GameObject, Player, Creature/*pets*/, Corpse/*resurrectable*/ typedef TYPELIST_4(GameObject, Creature/*except pets*/, DynamicObject, Corpse/*Bones*/) AllGridObjectTypes; typedef TYPELIST_5(Creature, GameObject, DynamicObject, Pet, Corpse) AllMapStoredObjectTypes; -typedef GridRefManager CorpseMapType; -typedef GridRefManager CreatureMapType; -typedef GridRefManager DynamicObjectMapType; -typedef GridRefManager GameObjectMapType; -typedef GridRefManager PlayerMapType; +typedef GridRefMgr CorpseMapType; +typedef GridRefMgr CreatureMapType; +typedef GridRefMgr DynamicObjectMapType; +typedef GridRefMgr GameObjectMapType; +typedef GridRefMgr PlayerMapType; enum GridMapTypeMask { diff --git a/src/server/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefMgr.h similarity index 79% rename from src/server/game/Grids/GridRefManager.h rename to src/server/game/Grids/GridRefMgr.h index 6accc53fc..5f0550dea 100644 --- a/src/server/game/Grids/GridRefManager.h +++ b/src/server/game/Grids/GridRefMgr.h @@ -7,19 +7,19 @@ #ifndef _GRIDREFMANAGER #define _GRIDREFMANAGER -#include "RefManager.h" +#include "RefMgr.h" template class GridReference; template -class GridRefManager : public RefManager, OBJECT> +class GridRefMgr : public RefMgr, OBJECT> { public: typedef LinkedListHead::Iterator< GridReference > iterator; - GridReference* getFirst() { return (GridReference*)RefManager, OBJECT>::getFirst(); } - GridReference* getLast() { return (GridReference*)RefManager, OBJECT>::getLast(); } + GridReference* getFirst() { return (GridReference*)RefMgr, OBJECT>::getFirst(); } + GridReference* getLast() { return (GridReference*)RefMgr, OBJECT>::getLast(); } iterator begin() { return iterator(getFirst()); } iterator end() { return iterator(nullptr); } diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h index d5d811f12..df97170f8 100644 --- a/src/server/game/Grids/GridReference.h +++ b/src/server/game/Grids/GridReference.h @@ -10,10 +10,10 @@ #include "LinkedReference/Reference.h" template -class GridRefManager; +class GridRefMgr; template -class GridReference : public Reference, OBJECT> +class GridReference : public Reference, OBJECT> { protected: void targetObjectBuildLink() override @@ -33,8 +33,8 @@ protected: this->getTarget()->decSize(); } public: - GridReference() : Reference, OBJECT>() {} + GridReference() : Reference, OBJECT>() {} ~GridReference() override { this->unlink(); } - GridReference* next() { return (GridReference*)Reference, OBJECT>::next(); } + GridReference* next() { return (GridReference*)Reference, OBJECT>::next(); } }; #endif diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h index ac37589b5..787a92628 100644 --- a/src/server/game/Grids/NGrid.h +++ b/src/server/game/Grids/NGrid.h @@ -47,7 +47,7 @@ public: [[nodiscard]] int32 getX() const { return i_x; } [[nodiscard]] int32 getY() const { return i_y; } - void link(GridRefManager >* pTo) + void link(GridRefMgr >* pTo) { i_Reference.link(pTo, this); } diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp index 3960f6560..1906ef491 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp +++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp @@ -327,10 +327,10 @@ void MessageDistDelivererToHostile::Visit(DynamicObjectMapType& m) } template -void ObjectUpdater::Visit(GridRefManager& m) +void ObjectUpdater::Visit(GridRefMgr& m) { T* obj; - for (typename GridRefManager::iterator iter = m.begin(); iter != m.end(); ) + for (typename GridRefMgr::iterator iter = m.begin(); iter != m.end(); ) { obj = iter->GetSource(); ++iter; diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index e0c66497f..350e0cc81 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -42,7 +42,7 @@ namespace Acore } void Visit(GameObjectMapType&); - template void Visit(GridRefManager& m); + template void Visit(GridRefMgr& m); void SendToSelf(void); }; @@ -51,7 +51,7 @@ namespace Acore WorldObject& i_object; explicit VisibleChangesNotifier(WorldObject& object) : i_object(object) {} - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} void Visit(PlayerMapType&); void Visit(CreatureMapType&); void Visit(DynamicObjectMapType&); @@ -61,7 +61,7 @@ namespace Acore { PlayerRelocationNotifier(Player& player, bool largeOnly): VisibleNotifier(player, false, largeOnly) { } - template void Visit(GridRefManager& m) { VisibleNotifier::Visit(m); } + template void Visit(GridRefMgr& m) { VisibleNotifier::Visit(m); } void Visit(PlayerMapType&); }; @@ -69,7 +69,7 @@ namespace Acore { Creature& i_creature; CreatureRelocationNotifier(Creature& c) : i_creature(c) {} - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} void Visit(PlayerMapType&); }; @@ -78,7 +78,7 @@ namespace Acore Unit& i_unit; bool isCreature; explicit AIRelocationNotifier(Unit& unit) : i_unit(unit), isCreature(unit.GetTypeId() == TYPEID_UNIT) {} - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} void Visit(CreatureMapType&); }; @@ -99,7 +99,7 @@ namespace Acore void Visit(PlayerMapType& m); void Visit(CreatureMapType& m); void Visit(DynamicObjectMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} void SendPacket(Player* player) { @@ -127,7 +127,7 @@ namespace Acore void Visit(PlayerMapType& m); void Visit(CreatureMapType& m); void Visit(DynamicObjectMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} void SendPacket(Player* player) { @@ -144,7 +144,7 @@ namespace Acore uint32 i_timeDiff; bool i_largeOnly; explicit ObjectUpdater(const uint32 diff, bool largeOnly) : i_timeDiff(diff), i_largeOnly(largeOnly) {} - template void Visit(GridRefManager& m); + template void Visit(GridRefMgr& m); void Visit(PlayerMapType&) {} void Visit(CorpseMapType&) {} }; @@ -170,7 +170,7 @@ namespace Acore void Visit(CorpseMapType& m); void Visit(DynamicObjectMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; template @@ -190,7 +190,7 @@ namespace Acore void Visit(CorpseMapType& m); void Visit(DynamicObjectMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; template @@ -210,7 +210,7 @@ namespace Acore void Visit(GameObjectMapType& m); void Visit(DynamicObjectMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; template @@ -267,7 +267,7 @@ namespace Acore i_do(itr->GetSource()); } - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; // Gameobject searchers @@ -284,7 +284,7 @@ namespace Acore void Visit(GameObjectMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; // Last accepted by Check GO if any (Check can change requirements at each call) @@ -300,7 +300,7 @@ namespace Acore void Visit(GameObjectMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; template @@ -315,7 +315,7 @@ namespace Acore void Visit(GameObjectMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; template @@ -331,7 +331,7 @@ namespace Acore _func(itr->GetSource()); } - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} private: Functor& _func; @@ -354,7 +354,7 @@ namespace Acore void Visit(CreatureMapType& m); void Visit(PlayerMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; // Last accepted by Check Unit if any (Check can change requirements at each call) @@ -371,7 +371,7 @@ namespace Acore void Visit(CreatureMapType& m); void Visit(PlayerMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; // All accepted by Check units if any @@ -388,7 +388,7 @@ namespace Acore void Visit(PlayerMapType& m); void Visit(CreatureMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; // Creature searchers @@ -405,7 +405,7 @@ namespace Acore void Visit(CreatureMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; // Last accepted by Check Creature if any (Check can change requirements at each call) @@ -421,7 +421,7 @@ namespace Acore void Visit(CreatureMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; template @@ -436,7 +436,7 @@ namespace Acore void Visit(CreatureMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; template @@ -455,7 +455,7 @@ namespace Acore i_do(itr->GetSource()); } - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; // Player searchers @@ -472,7 +472,7 @@ namespace Acore void Visit(PlayerMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; template @@ -487,7 +487,7 @@ namespace Acore void Visit(PlayerMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; template @@ -503,7 +503,7 @@ namespace Acore void Visit(PlayerMapType& m); void Visit(CreatureMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; template @@ -519,7 +519,7 @@ namespace Acore void Visit(PlayerMapType& m); - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; template @@ -538,7 +538,7 @@ namespace Acore i_do(itr->GetSource()); } - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; template @@ -558,7 +558,7 @@ namespace Acore i_do(itr->GetSource()); } - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} }; // CHECKS && DO classes diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index b06ee1082..c0785b605 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -17,13 +17,13 @@ #include "WorldPacket.h" template -inline void Acore::VisibleNotifier::Visit(GridRefManager& m) +inline void Acore::VisibleNotifier::Visit(GridRefMgr& m) { // Xinef: Update gameobjects only if (i_gobjOnly) return; - for (typename GridRefManager::iterator iter = m.begin(); iter != m.end(); ++iter) + for (typename GridRefMgr::iterator iter = m.begin(); iter != m.end(); ++iter) { if (i_largeOnly != iter->GetSource()->IsVisibilityOverridden()) continue; diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index e0b0e177e..bb1c19e39 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -27,7 +27,7 @@ public: void Visit(CorpseMapType& m); - template void Visit(GridRefManager&) { } + template void Visit(GridRefMgr&) { } private: Cell i_cell; @@ -54,7 +54,7 @@ template<> void ObjectGridLoader::SetObjectCell(GameObject* obj, CellCoord const } template -void AddObjectHelper(CellCoord& cell, GridRefManager& m, uint32& count, Map* /*map*/, T* obj) +void AddObjectHelper(CellCoord& cell, GridRefMgr& m, uint32& count, Map* /*map*/, T* obj) { obj->AddToGrid(m); ObjectGridLoader::SetObjectCell(obj, cell); @@ -87,7 +87,7 @@ void AddObjectHelper(CellCoord& cell, GameObjectMapType& m, uint32& count, Map* } template -void LoadHelper(CellGuidSet const& guid_set, CellCoord& cell, GridRefManager& m, uint32& count, Map* map) +void LoadHelper(CellGuidSet const& guid_set, CellCoord& cell, GridRefMgr& m, uint32& count, Map* map) { for (CellGuidSet::const_iterator i_guid = guid_set.begin(); i_guid != guid_set.end(); ++i_guid) { @@ -105,7 +105,7 @@ void LoadHelper(CellGuidSet const& guid_set, CellCoord& cell, GridRefManager& } template <> -void LoadHelper(CellGuidSet const& guid_set, CellCoord& cell, GridRefManager& m, uint32& count, Map* map) +void LoadHelper(CellGuidSet const& guid_set, CellCoord& cell, GridRefMgr& m, uint32& count, Map* map) { for (CellGuidSet::const_iterator i_guid = guid_set.begin(); i_guid != guid_set.end(); ++i_guid) { @@ -187,7 +187,7 @@ void ObjectGridLoader::LoadN(void) } template -void ObjectGridUnloader::Visit(GridRefManager& m) +void ObjectGridUnloader::Visit(GridRefMgr& m) { while (!m.isEmpty()) { @@ -206,9 +206,9 @@ void ObjectGridUnloader::Visit(GridRefManager& m) } template -void ObjectGridCleaner::Visit(GridRefManager& m) +void ObjectGridCleaner::Visit(GridRefMgr& m) { - for (typename GridRefManager::iterator iter = m.begin(); iter != m.end(); ++iter) + for (typename GridRefMgr::iterator iter = m.begin(); iter != m.end(); ++iter) iter->GetSource()->CleanupsBeforeDelete(); } diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h index 6deb7707b..79fb700fe 100644 --- a/src/server/game/Grids/ObjectGridLoader.h +++ b/src/server/game/Grids/ObjectGridLoader.h @@ -46,7 +46,7 @@ private: class ObjectGridCleaner { public: - template void Visit(GridRefManager&); + template void Visit(GridRefMgr&); }; //Delete objects before deleting NGrid @@ -54,6 +54,6 @@ class ObjectGridUnloader { public: void Visit(CorpseMapType&) { } // corpses are deleted with Map - template void Visit(GridRefManager& m); + template void Visit(GridRefMgr& m); }; #endif diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 54fd027af..66177cf32 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -13,7 +13,7 @@ #include "LFG.h" #include "LFGMgr.h" #include "Log.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Opcodes.h" #include "Pet.h" diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 59515bdf1..1aedd1008 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -8,7 +8,7 @@ #define AZEROTHCORE_GROUP_H #include "DBCEnums.h" -#include "GroupRefManager.h" +#include "GroupRefMgr.h" #include "LootMgr.h" #include "QueryResult.h" #include "SharedDefines.h" @@ -318,7 +318,7 @@ protected: void ToggleGroupMemberFlag(member_witerator slot, uint8 flag, bool apply); MemberSlotList m_memberSlots; - GroupRefManager m_memberMgr; + GroupRefMgr m_memberMgr; InvitesList m_invitees; ObjectGuid m_leaderGuid; std::string m_leaderName; diff --git a/src/server/game/Groups/GroupRefManager.h b/src/server/game/Groups/GroupRefMgr.h similarity index 69% rename from src/server/game/Groups/GroupRefManager.h rename to src/server/game/Groups/GroupRefMgr.h index 1a6561787..c9a645d53 100644 --- a/src/server/game/Groups/GroupRefManager.h +++ b/src/server/game/Groups/GroupRefMgr.h @@ -7,16 +7,16 @@ #ifndef _GROUPREFMANAGER #define _GROUPREFMANAGER -#include "RefManager.h" +#include "RefMgr.h" class Group; class Player; class GroupReference; -class GroupRefManager : public RefManager +class GroupRefMgr : public RefMgr { public: - GroupReference* getFirst() { return ((GroupReference*)RefManager::getFirst()); } - GroupReference const* getFirst() const { return ((GroupReference const*)RefManager::getFirst()); } + GroupReference* getFirst() { return ((GroupReference*)RefMgr::getFirst()); } + GroupReference const* getFirst() const { return ((GroupReference const*)RefMgr::getFirst()); } }; #endif diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 5497ec301..8fbf7e4d9 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -21,7 +21,7 @@ #include "Language.h" #include "Log.h" #include "LootMgr.h" -#include "MapManager.h" +#include "MapMgr.h" #include "Object.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 51e514ef5..d968e4ef0 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -14,7 +14,7 @@ #include "InstanceSaveMgr.h" #include "Log.h" #include "MathUtil.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Opcodes.h" #include "Pet.h" @@ -47,9 +47,9 @@ void WorldSession::HandleMoveWorldportAck() WorldLocation const& loc = GetPlayer()->GetTeleportDest(); // possible errors in the coordinate validity check - if (!MapManager::IsValidMapCoord(loc)) + if (!MapMgr::IsValidMapCoord(loc)) { - KickPlayer("!MapManager::IsValidMapCoord(loc)"); + KickPlayer("!MapMgr::IsValidMapCoord(loc)"); return; } @@ -115,8 +115,8 @@ void WorldSession::HandleMoveWorldportAck() _player->m_movementInfo.RemoveMovementFlag(MOVEMENTFLAG_ONTRANSPORT); } - if (!_player->getHostileRefManager().isEmpty()) - _player->getHostileRefManager().deleteReferences(); // pussywizard: multithreading crashfix + if (!_player->getHostileRefMgr().isEmpty()) + _player->getHostileRefMgr().deleteReferences(); // pussywizard: multithreading crashfix CellCoord pair(Acore::ComputeCellCoord(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY())); Cell cell(pair); diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index 03ce4f00a..84a1c1e23 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -6,7 +6,7 @@ #include "Common.h" #include "Log.h" -#include "MapManager.h" +#include "MapMgr.h" #include "NPCHandler.h" #include "ObjectMgr.h" #include "Opcodes.h" diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index e34e73b05..d06d3f7cc 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -14,7 +14,7 @@ #include "Log.h" #include "Map.h" #include "MapInstanced.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Player.h" #include "ScriptMgr.h" @@ -22,11 +22,11 @@ #include "Transport.h" #include "World.h" -uint16 InstanceSaveManager::ResetTimeDelay[] = {3600, 900, 300, 60, 0}; -PlayerBindStorage InstanceSaveManager::playerBindStorage; -BoundInstancesMap InstanceSaveManager::emptyBoundInstancesMap; +uint16 InstanceSaveMgr::ResetTimeDelay[] = {3600, 900, 300, 60, 0}; +PlayerBindStorage InstanceSaveMgr::playerBindStorage; +BoundInstancesMap InstanceSaveMgr::emptyBoundInstancesMap; -InstanceSaveManager::~InstanceSaveManager() +InstanceSaveMgr::~InstanceSaveMgr() { lock_instLists = true; // pussywizard: crashes on calling function in destructor (PlayerUnbindInstance), completely not needed anyway @@ -42,35 +42,35 @@ InstanceSaveManager::~InstanceSaveManager() }*/ } -InstanceSaveManager* InstanceSaveManager::instance() +InstanceSaveMgr* InstanceSaveMgr::instance() { - static InstanceSaveManager instance; + static InstanceSaveMgr instance; return &instance; } /* - adding instance into manager */ -InstanceSave* InstanceSaveManager::AddInstanceSave(uint32 mapId, uint32 instanceId, Difficulty difficulty, bool startup /*=false*/) +InstanceSave* InstanceSaveMgr::AddInstanceSave(uint32 mapId, uint32 instanceId, Difficulty difficulty, bool startup /*=false*/) { ASSERT(!GetInstanceSave(instanceId)); const MapEntry* entry = sMapStore.LookupEntry(mapId); if (!entry) { - LOG_ERROR("instance.save", "InstanceSaveManager::AddInstanceSave: wrong mapid = %d, instanceid = %d!", mapId, instanceId); + LOG_ERROR("instance.save", "InstanceSaveMgr::AddInstanceSave: wrong mapid = %d, instanceid = %d!", mapId, instanceId); return nullptr; } if (instanceId == 0) { - LOG_ERROR("instance.save", "InstanceSaveManager::AddInstanceSave: mapid = %d, wrong instanceid = %d!", mapId, instanceId); + LOG_ERROR("instance.save", "InstanceSaveMgr::AddInstanceSave: mapid = %d, wrong instanceid = %d!", mapId, instanceId); return nullptr; } if (difficulty >= (entry->IsRaid() ? MAX_RAID_DIFFICULTY : MAX_DUNGEON_DIFFICULTY)) { - LOG_ERROR("instance.save", "InstanceSaveManager::AddInstanceSave: mapid = %d, instanceid = %d, wrong dificalty %u!", mapId, instanceId, difficulty); + LOG_ERROR("instance.save", "InstanceSaveMgr::AddInstanceSave: mapid = %d, instanceid = %d, wrong dificalty %u!", mapId, instanceId, difficulty); return nullptr; } @@ -93,18 +93,18 @@ InstanceSave* InstanceSaveManager::AddInstanceSave(uint32 mapId, uint32 instance return save; } -InstanceSave* InstanceSaveManager::GetInstanceSave(uint32 InstanceId) +InstanceSave* InstanceSaveMgr::GetInstanceSave(uint32 InstanceId) { InstanceSaveHashMap::iterator itr = m_instanceSaveById.find(InstanceId); return itr != m_instanceSaveById.end() ? itr->second : nullptr; } -bool InstanceSaveManager::DeleteInstanceSaveIfNeeded(uint32 InstanceId, bool skipMapCheck) +bool InstanceSaveMgr::DeleteInstanceSaveIfNeeded(uint32 InstanceId, bool skipMapCheck) { return DeleteInstanceSaveIfNeeded(GetInstanceSave(InstanceId), skipMapCheck); } -bool InstanceSaveManager::DeleteInstanceSaveIfNeeded(InstanceSave* save, bool skipMapCheck) +bool InstanceSaveMgr::DeleteInstanceSaveIfNeeded(InstanceSave* save, bool skipMapCheck) { // pussywizard: save is removed only when there are no more players bound AND the map doesn't exist // pussywizard: this function is called when unbinding a player and when unloading a map @@ -202,7 +202,7 @@ void InstanceSave::AddPlayer(ObjectGuid guid) m_playerList.push_back(guid); } -bool InstanceSave::RemovePlayer(ObjectGuid guid, InstanceSaveManager* ism) +bool InstanceSave::RemovePlayer(ObjectGuid guid, InstanceSaveMgr* ism) { std::lock_guard guard(_lock); m_playerList.remove(guid); @@ -211,7 +211,7 @@ bool InstanceSave::RemovePlayer(ObjectGuid guid, InstanceSaveManager* ism) return ism->DeleteInstanceSaveIfNeeded(this->GetInstanceId(), false); } -void InstanceSaveManager::LoadInstances() +void InstanceSaveMgr::LoadInstances() { uint32 oldMSTime = getMSTime(); @@ -247,7 +247,7 @@ void InstanceSaveManager::LoadInstances() LOG_INFO("server.loading", " "); } -void InstanceSaveManager::LoadResetTimes() +void InstanceSaveMgr::LoadResetTimes() { time_t now = time(nullptr); time_t today = (now / DAY) * DAY; @@ -267,7 +267,7 @@ void InstanceSaveManager::LoadResetTimes() MapDifficulty const* mapDiff = GetMapDifficultyData(mapid, difficulty); if (!mapDiff) { - LOG_ERROR("instance.save", "InstanceSaveManager::LoadResetTimes: invalid mapid(%u)/difficulty(%u) pair in instance_reset!", mapid, difficulty); + LOG_ERROR("instance.save", "InstanceSaveMgr::LoadResetTimes: invalid mapid(%u)/difficulty(%u) pair in instance_reset!", mapid, difficulty); CharacterDatabase.DirectPExecute("DELETE FROM instance_reset WHERE mapid = '%u' AND difficulty = '%u'", mapid, difficulty); continue; } @@ -322,7 +322,7 @@ void InstanceSaveManager::LoadResetTimes() } } -void InstanceSaveManager::LoadInstanceSaves() +void InstanceSaveMgr::LoadInstanceSaves() { QueryResult result = CharacterDatabase.Query("SELECT id, map, resettime, difficulty, completedEncounters, data FROM instance ORDER BY id ASC"); if (result) @@ -353,7 +353,7 @@ void InstanceSaveManager::LoadInstanceSaves() } } -void InstanceSaveManager::LoadCharacterBinds() +void InstanceSaveMgr::LoadCharacterBinds() { lock_instLists = true; @@ -405,12 +405,12 @@ void InstanceSaveManager::LoadCharacterBinds() lock_instLists = false; } -void InstanceSaveManager::ScheduleReset(time_t time, InstResetEvent event) +void InstanceSaveMgr::ScheduleReset(time_t time, InstResetEvent event) { m_resetTimeQueue.insert(std::pair(time, event)); } -void InstanceSaveManager::Update() +void InstanceSaveMgr::Update() { time_t now = time(nullptr); time_t t; @@ -455,7 +455,7 @@ void InstanceSaveManager::Update() } } -void InstanceSaveManager::_ResetSave(InstanceSaveHashMap::iterator& itr) +void InstanceSaveMgr::_ResetSave(InstanceSaveHashMap::iterator& itr) { lock_instLists = true; @@ -504,7 +504,7 @@ void InstanceSaveManager::_ResetSave(InstanceSaveHashMap::iterator& itr) lock_instLists = false; } -void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, bool warn, time_t resetTime) +void InstanceSaveMgr::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, bool warn, time_t resetTime) { // global reset for all instances of the given map MapEntry const* mapEntry = sMapStore.LookupEntry(mapid); @@ -518,7 +518,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, b MapDifficulty const* mapDiff = GetMapDifficultyData(mapid, difficulty); if (!mapDiff || !mapDiff->resetTime) { - LOG_ERROR("instance.save", "InstanceSaveManager::ResetOrWarnAll: not valid difficulty or no reset delay for map %d", mapid); + LOG_ERROR("instance.save", "InstanceSaveMgr::ResetOrWarnAll: not valid difficulty or no reset delay for map %d", mapid); return; } @@ -580,7 +580,7 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, b } } -InstancePlayerBind* InstanceSaveManager::PlayerBindToInstance(ObjectGuid guid, InstanceSave* save, bool permanent, Player* player /*= nullptr*/) +InstancePlayerBind* InstanceSaveMgr::PlayerBindToInstance(ObjectGuid guid, InstanceSave* save, bool permanent, Player* player /*= nullptr*/) { InstancePlayerBind& bind = playerBindStorage[guid]->m[save->GetDifficulty()][save->GetMapId()]; ASSERT(!bind.perm || permanent); // ensure there's no changing permanent to temporary, this can be done only by unbinding @@ -649,7 +649,7 @@ InstancePlayerBind* InstanceSaveManager::PlayerBindToInstance(ObjectGuid guid, I return &bind; } -void InstanceSaveManager::PlayerUnbindInstance(ObjectGuid guid, uint32 mapid, Difficulty difficulty, bool deleteFromDB, Player* player /*= nullptr*/) +void InstanceSaveMgr::PlayerUnbindInstance(ObjectGuid guid, uint32 mapid, Difficulty difficulty, bool deleteFromDB, Player* player /*= nullptr*/) { BoundInstancesMapWrapper* w = playerBindStorage[guid]; BoundInstancesMap::iterator itr = w->m[difficulty].find(mapid); @@ -672,7 +672,7 @@ void InstanceSaveManager::PlayerUnbindInstance(ObjectGuid guid, uint32 mapid, Di } } -void InstanceSaveManager::PlayerUnbindInstanceNotExtended(ObjectGuid guid, uint32 mapid, Difficulty difficulty, Player* player /*= nullptr*/) +void InstanceSaveMgr::PlayerUnbindInstanceNotExtended(ObjectGuid guid, uint32 mapid, Difficulty difficulty, Player* player /*= nullptr*/) { BoundInstancesMapWrapper* w = playerBindStorage[guid]; BoundInstancesMap::iterator itr = w->m[difficulty].find(mapid); @@ -692,7 +692,7 @@ void InstanceSaveManager::PlayerUnbindInstanceNotExtended(ObjectGuid guid, uint3 } } -InstancePlayerBind* InstanceSaveManager::PlayerGetBoundInstance(ObjectGuid guid, uint32 mapid, Difficulty difficulty) +InstancePlayerBind* InstanceSaveMgr::PlayerGetBoundInstance(ObjectGuid guid, uint32 mapid, Difficulty difficulty) { Difficulty difficulty_fixed = ( IsSharedDifficultyMap(mapid) ? Difficulty(difficulty % 2) : difficulty); @@ -714,7 +714,7 @@ InstancePlayerBind* InstanceSaveManager::PlayerGetBoundInstance(ObjectGuid guid, return nullptr; } -bool InstanceSaveManager::PlayerIsPermBoundToInstance(ObjectGuid guid, uint32 mapid, Difficulty difficulty) +bool InstanceSaveMgr::PlayerIsPermBoundToInstance(ObjectGuid guid, uint32 mapid, Difficulty difficulty) { if (InstancePlayerBind* bind = PlayerGetBoundInstance(guid, mapid, difficulty)) if (bind->perm) @@ -722,7 +722,7 @@ bool InstanceSaveManager::PlayerIsPermBoundToInstance(ObjectGuid guid, uint32 ma return false; } -BoundInstancesMap const& InstanceSaveManager::PlayerGetBoundInstances(ObjectGuid guid, Difficulty difficulty) +BoundInstancesMap const& InstanceSaveMgr::PlayerGetBoundInstances(ObjectGuid guid, Difficulty difficulty) { PlayerBindStorage::iterator itr = playerBindStorage.find(guid); if (itr != playerBindStorage.end()) @@ -730,19 +730,19 @@ BoundInstancesMap const& InstanceSaveManager::PlayerGetBoundInstances(ObjectGuid return emptyBoundInstancesMap; } -void InstanceSaveManager::PlayerCreateBoundInstancesMaps(ObjectGuid guid) +void InstanceSaveMgr::PlayerCreateBoundInstancesMaps(ObjectGuid guid) { if (playerBindStorage.find(guid) == playerBindStorage.end()) playerBindStorage[guid] = new BoundInstancesMapWrapper; } -InstanceSave* InstanceSaveManager::PlayerGetInstanceSave(ObjectGuid guid, uint32 mapid, Difficulty difficulty) +InstanceSave* InstanceSaveMgr::PlayerGetInstanceSave(ObjectGuid guid, uint32 mapid, Difficulty difficulty) { InstancePlayerBind* pBind = PlayerGetBoundInstance(guid, mapid, difficulty); return (pBind ? pBind->save : nullptr); } -uint32 InstanceSaveManager::PlayerGetDestinationInstanceId(Player* player, uint32 mapid, Difficulty difficulty) +uint32 InstanceSaveMgr::PlayerGetDestinationInstanceId(Player* player, uint32 mapid, Difficulty difficulty) { // returning 0 means a new instance will be created // non-zero implicates that InstanceSave exists @@ -759,7 +759,7 @@ uint32 InstanceSaveManager::PlayerGetDestinationInstanceId(Player* player, uint3 return ipb ? ipb->save->GetInstanceId() : 0; // 4. self temp } -void InstanceSaveManager::CopyBinds(ObjectGuid from, ObjectGuid to, Player* toPlr) +void InstanceSaveMgr::CopyBinds(ObjectGuid from, ObjectGuid to, Player* toPlr) { if (from == to) return; @@ -773,7 +773,7 @@ void InstanceSaveManager::CopyBinds(ObjectGuid from, ObjectGuid to, Player* toPl } } -void InstanceSaveManager::UnbindAllFor(InstanceSave* save) +void InstanceSaveMgr::UnbindAllFor(InstanceSave* save) { GuidList& pList = save->m_playerList; while (!pList.empty()) diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index a0c5c997a..0d158db93 100644 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -21,7 +21,7 @@ struct InstanceTemplate; struct MapEntry; class Player; class Group; -class InstanceSaveManager; +class InstanceSaveMgr; class InstanceSave; struct InstancePlayerBind @@ -43,7 +43,7 @@ typedef std::unordered_map Play class InstanceSave { - friend class InstanceSaveManager; + friend class InstanceSaveMgr; public: InstanceSave(uint16 MapId, uint32 InstanceId, Difficulty difficulty, time_t resetTime, time_t extendedResetTime); ~InstanceSave(); @@ -74,7 +74,7 @@ public: MapEntry const* GetMapEntry(); void AddPlayer(ObjectGuid guid); - bool RemovePlayer(ObjectGuid guid, InstanceSaveManager* ism); + bool RemovePlayer(ObjectGuid guid, InstanceSaveMgr* ism); private: GuidList m_playerList; @@ -92,16 +92,16 @@ private: typedef std::unordered_map ResetTimeByMapDifficultyMap; -class InstanceSaveManager +class InstanceSaveMgr { friend class InstanceSave; private: - InstanceSaveManager() {}; - ~InstanceSaveManager(); + InstanceSaveMgr() {}; + ~InstanceSaveMgr(); public: - static InstanceSaveManager* instance(); + static InstanceSaveMgr* instance(); typedef std::unordered_map InstanceSaveHashMap; @@ -186,6 +186,6 @@ private: ResetTimeQueue m_resetTimeQueue; }; -#define sInstanceSaveMgr InstanceSaveManager::instance() +#define sInstanceSaveMgr InstanceSaveMgr::instance() #endif diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index 05ff318e0..1f6911252 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -11,7 +11,7 @@ #include "ConditionMgr.h" #include "ItemEnchantmentMgr.h" #include "ObjectGuid.h" -#include "RefManager.h" +#include "RefMgr.h" #include "SharedDefines.h" #include #include @@ -278,13 +278,13 @@ public: //===================================================== -class LootValidatorRefManager : public RefManager +class LootValidatorRefMgr : public RefMgr { public: typedef LinkedListHead::Iterator< LootValidatorRef > iterator; - LootValidatorRef* getFirst() { return (LootValidatorRef*)RefManager::getFirst(); } - LootValidatorRef* getLast() { return (LootValidatorRef*)RefManager::getLast(); } + LootValidatorRef* getFirst() { return (LootValidatorRef*)RefMgr::getFirst(); } + LootValidatorRef* getLast() { return (LootValidatorRef*)RefMgr::getLast(); } iterator begin() { return iterator(getFirst()); } iterator end() { return iterator(nullptr); } @@ -324,7 +324,7 @@ struct Loot // if loot becomes invalid this reference is used to inform the listener void addLootValidatorRef(LootValidatorRef* pLootValidatorRef) { - i_LootValidatorRefManager.insertFirst(pLootValidatorRef); + i_LootValidatorRefMgr.insertFirst(pLootValidatorRef); } // void clear(); @@ -348,7 +348,7 @@ struct Loot gold = 0; unlootedCount = 0; roundRobinPlayer.Clear(); - i_LootValidatorRefManager.clearReferences(); + i_LootValidatorRefMgr.clearReferences(); loot_type = LOOT_NONE; } @@ -386,7 +386,7 @@ private: QuestItemMap PlayerNonQuestNonFFAConditionalItems; // All rolls are registered here. They need to know, when the loot is not valid anymore - LootValidatorRefManager i_LootValidatorRefManager; + LootValidatorRefMgr i_LootValidatorRefMgr; }; struct LootView diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 151fb60c2..915a86ea2 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -25,7 +25,7 @@ #include "Transport.h" #include "Vehicle.h" #include "VMapFactory.h" -#include "VMapManager2.h" +#include "VMapMgr2.h" #ifdef ELUNA #include "LuaEngine.h" @@ -65,8 +65,8 @@ Map::~Map() if (!m_scriptSchedule.empty()) sScriptMgr->DecreaseScheduledScriptCount(m_scriptSchedule.size()); - //MMAP::MMapFactory::createOrGetMMapManager()->unloadMap(GetId()); - MMAP::MMapFactory::createOrGetMMapManager()->unloadMapInstance(GetId(), i_InstanceId); + //MMAP::MMapFactory::createOrGetMMapMgr()->unloadMap(GetId()); + MMAP::MMapFactory::createOrGetMMapMgr()->unloadMapInstance(GetId(), i_InstanceId); } bool Map::ExistMap(uint32 mapid, int gx, int gy) @@ -98,7 +98,7 @@ bool Map::ExistMap(uint32 mapid, int gx, int gy) bool Map::ExistVMap(uint32 mapid, int gx, int gy) { - if (VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager()) + if (VMAP::IVMapMgr* vmgr = VMAP::VMapFactory::createOrGetVMapMgr()) { if (vmgr->isMapLoadingEnabled()) { @@ -120,7 +120,7 @@ void Map::LoadMMap(int gx, int gy) if (!DisableMgr::IsPathfindingEnabled(this)) // pussywizard return; - int mmapLoadResult = MMAP::MMapFactory::createOrGetMMapManager()->loadMap(GetId(), gx, gy); + int mmapLoadResult = MMAP::MMapFactory::createOrGetMMapMgr()->loadMap(GetId(), gx, gy); switch (mmapLoadResult) { case MMAP::MMAP_LOAD_RESULT_OK: @@ -138,7 +138,7 @@ void Map::LoadMMap(int gx, int gy) void Map::LoadVMap(int gx, int gy) { // x and y are swapped !! - int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapManager()->loadMap((sWorld->GetDataPath() + "vmaps").c_str(), GetId(), gx, gy); + int vmapLoadResult = VMAP::VMapFactory::createOrGetVMapMgr()->loadMap((sWorld->GetDataPath() + "vmaps").c_str(), GetId(), gx, gy); switch (vmapLoadResult) { case VMAP::VMAP_LOAD_RESULT_OK: @@ -717,7 +717,7 @@ void Map::Update(const uint32 t_diff, const uint32 s_diff, bool /*thread*/) _dynamicTree.update(t_diff); /// update worldsessions for existing players - for (m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) + for (m_mapRefIter = m_mapRefMgr.begin(); m_mapRefIter != m_mapRefMgr.end(); ++m_mapRefIter) { Player* player = m_mapRefIter->GetSource(); if (player && player->IsInWorld()) @@ -731,7 +731,7 @@ void Map::Update(const uint32 t_diff, const uint32 s_diff, bool /*thread*/) if (!t_diff) { - for (m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) + for (m_mapRefIter = m_mapRefMgr.begin(); m_mapRefIter != m_mapRefMgr.end(); ++m_mapRefIter) { Player* player = m_mapRefIter->GetSource(); @@ -780,7 +780,7 @@ void Map::Update(const uint32 t_diff, const uint32 s_diff, bool /*thread*/) // the player iterator is stored in the map object // to make sure calls to Map::Remove don't invalidate it - for (m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter) + for (m_mapRefIter = m_mapRefMgr.begin(); m_mapRefIter != m_mapRefMgr.end(); ++m_mapRefIter) { Player* player = m_mapRefIter->GetSource(); @@ -811,7 +811,7 @@ void Map::Update(const uint32 t_diff, const uint32 s_diff, bool /*thread*/) updateList.clear(); float rangeSq = player->GetGridActivationRange() - 1.0f; rangeSq = rangeSq * rangeSq; - HostileReference* ref = player->getHostileRefManager().getFirst(); + HostileReference* ref = player->getHostileRefMgr().getFirst(); while (ref) { if (Unit* unit = ref->GetSource()->GetOwner()) @@ -866,19 +866,19 @@ void Map::HandleDelayedVisibility() struct ResetNotifier { - templateinline void resetNotify(GridRefManager& m) + templateinline void resetNotify(GridRefMgr& m) { - for (typename GridRefManager::iterator iter = m.begin(); iter != m.end(); ++iter) + for (typename GridRefMgr::iterator iter = m.begin(); iter != m.end(); ++iter) iter->GetSource()->ResetAllNotifies(); } - template void Visit(GridRefManager&) {} + template void Visit(GridRefMgr&) {} void Visit(CreatureMapType& m) { resetNotify(m);} void Visit(PlayerMapType& m) { resetNotify(m);} }; void Map::RemovePlayerFromMap(Player* player, bool remove) { - player->getHostileRefManager().deleteReferences(); // pussywizard: multithreading crashfix + player->getHostileRefMgr().deleteReferences(); // pussywizard: multithreading crashfix bool inWorld = player->IsInWorld(); player->RemoveFromWorld(); @@ -1213,8 +1213,8 @@ bool Map::UnloadGrid(NGridType& ngrid) delete GridMaps[gx][gy]; } // x and y are swapped - VMAP::VMapFactory::createOrGetVMapManager()->unloadMap(GetId(), gx, gy); - MMAP::MMapFactory::createOrGetMMapManager()->unloadMap(GetId(), gx, gy); + VMAP::VMapFactory::createOrGetVMapMgr()->unloadMap(GetId(), gx, gy); + MMAP::MMapFactory::createOrGetMMapMgr()->unloadMap(GetId(), gx, gy); } GridMaps[gx][gy] = nullptr; @@ -1227,7 +1227,7 @@ void Map::RemoveAllPlayers() { if (HavePlayers()) { - for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefMgr::iterator itr = m_mapRefMgr.begin(); itr != m_mapRefMgr.end(); ++itr) { Player* player = itr->GetSource(); if (!player->IsBeingTeleportedFar()) @@ -1246,11 +1246,11 @@ void Map::UnloadAll() _creaturesToMove.clear(); _gameObjectsToMove.clear(); - for (GridRefManager::iterator i = GridRefManager::begin(); i != GridRefManager::end();) + for (GridRefMgr::iterator i = GridRefMgr::begin(); i != GridRefMgr::end();) { NGridType& grid(*i->GetSource()); ++i; - UnloadGrid(grid); // deletes the grid and removes it from the GridRefManager + UnloadGrid(grid); // deletes the grid and removes it from the GridRefMgr } // pussywizard: crashfix, some npc can be left on transport (not a default passenger) @@ -2018,7 +2018,7 @@ float Map::GetHeight(float x, float y, float z, bool checkVMap /*= true*/, float float vmapHeight = VMAP_INVALID_HEIGHT_VALUE; if (checkVMap) { - VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager(); + VMAP::IVMapMgr* vmgr = VMAP::VMapFactory::createOrGetVMapMgr(); vmapHeight = vmgr->getHeight(GetId(), x, y, z, maxSearchDist); // look from a bit higher pos to find the floor } @@ -2070,7 +2070,7 @@ bool Map::GetAreaInfo(uint32 phaseMask, float x, float y, float z, uint32& flags float vmap_z = z; float dynamic_z = z; float check_z = z; - VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager(); + VMAP::IVMapMgr* vmgr = VMAP::VMapFactory::createOrGetVMapMgr(); uint32 vflags; int32 vadtId; int32 vrootId; @@ -2172,7 +2172,7 @@ LiquidData const Map::GetLiquidData(uint32 phaseMask, float x, float y, float z, { LiquidData liquidData; - VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager(); + VMAP::IVMapMgr* vmgr = VMAP::VMapFactory::createOrGetVMapMgr(); float liquid_level = INVALID_HEIGHT; float ground_level = INVALID_HEIGHT; uint32 liquid_type = 0; @@ -2258,7 +2258,7 @@ void Map::GetFullTerrainStatusForPosition(uint32 phaseMask, float x, float y, fl { GridMap* gmap = GetGrid(x, y); - VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager(); + VMAP::IVMapMgr* vmgr = VMAP::VMapFactory::createOrGetVMapMgr(); VMAP::AreaAndLiquidData vmapData; VMAP::AreaAndLiquidData dynData; VMAP::AreaAndLiquidData* wmoData = nullptr; @@ -2405,7 +2405,7 @@ float Map::GetWaterLevel(float x, float y) const bool Map::isInLineOfSight(float x1, float y1, float z1, float x2, float y2, float z2, uint32 phasemask, LineOfSightChecks checks) const { - if ((checks & LINEOFSIGHT_CHECK_VMAP) && !VMAP::VMapFactory::createOrGetVMapManager()->isInLineOfSight(GetId(), x1, y1, z1, x2, y2, z2)) + if ((checks & LINEOFSIGHT_CHECK_VMAP) && !VMAP::VMapFactory::createOrGetVMapMgr()->isInLineOfSight(GetId(), x1, y1, z1, x2, y2, z2)) return false; if (sWorld->getBoolConfig(CONFIG_CHECK_GOBJECT_LOS) && (checks & LINEOFSIGHT_CHECK_GOBJECT) @@ -2673,7 +2673,7 @@ void Map::RemoveAllObjectsInRemoveList() uint32 Map::GetPlayersCountExceptGMs() const { uint32 count = 0; - for (MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefMgr::const_iterator itr = m_mapRefMgr.begin(); itr != m_mapRefMgr.end(); ++itr) if (!itr->GetSource()->IsGameMaster()) ++count; return count; @@ -2681,7 +2681,7 @@ uint32 Map::GetPlayersCountExceptGMs() const void Map::SendToPlayers(WorldPacket const* data) const { - for (MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefMgr::const_iterator itr = m_mapRefMgr.begin(); itr != m_mapRefMgr.end(); ++itr) itr->GetSource()->GetSession()->SendPacket(data); } @@ -2957,7 +2957,7 @@ void InstanceMap::Update(const uint32 t_diff, const uint32 s_diff, bool /*thread void InstanceMap::RemovePlayerFromMap(Player* player, bool remove) { // pussywizard: moved m_unloadTimer to InstanceMap::AfterPlayerUnlinkFromMap(), in this function if 2 players run out at the same time the instance won't close - //if (!m_unloadTimer && m_mapRefManager.getSize() == 1) + //if (!m_unloadTimer && m_mapRefMgr.getSize() == 1) // m_unloadTimer = m_unloadWhenEmpty ? MIN_UNLOAD_DELAY : std::max(sWorld->getIntConfig(CONFIG_INSTANCE_UNLOAD_DELAY), (uint32)MIN_UNLOAD_DELAY); Map::RemovePlayerFromMap(player, remove); player->SetPendingBind(0, 0); @@ -3020,7 +3020,7 @@ bool InstanceMap::Reset(uint8 method, GuidList* globalResetSkipList) if (method == INSTANCE_RESET_GLOBAL) { // pussywizard: teleport out immediately - for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefMgr::iterator itr = m_mapRefMgr.begin(); itr != m_mapRefMgr.end(); ++itr) { // teleport players that are no longer bound (can be still bound if extended id) if (!globalResetSkipList || std::find(globalResetSkipList->begin(), globalResetSkipList->end(), itr->GetSource()->GetGUID()) == globalResetSkipList->end()) @@ -3037,14 +3037,14 @@ bool InstanceMap::Reset(uint8 method, GuidList* globalResetSkipList) m_resetAfterUnload = true; } - return m_mapRefManager.isEmpty(); + return m_mapRefMgr.isEmpty(); } if (HavePlayers()) { if (method == INSTANCE_RESET_ALL || method == INSTANCE_RESET_CHANGE_DIFFICULTY) { - for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefMgr::iterator itr = m_mapRefMgr.begin(); itr != m_mapRefMgr.end(); ++itr) itr->GetSource()->SendResetFailedNotify(GetId()); } } @@ -3054,7 +3054,7 @@ bool InstanceMap::Reset(uint8 method, GuidList* globalResetSkipList) m_resetAfterUnload = true; } - return m_mapRefManager.isEmpty(); + return m_mapRefMgr.isEmpty(); } std::string const& InstanceMap::GetScriptName() const @@ -3077,7 +3077,7 @@ void InstanceMap::PermBindAllPlayers() Player* player; Group* group; // group members outside the instance group don't get bound - for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefMgr::iterator itr = m_mapRefMgr.begin(); itr != m_mapRefMgr.end(); ++itr) { player = itr->GetSource(); group = player->GetGroup(); @@ -3115,7 +3115,7 @@ void InstanceMap::UnloadAll() void InstanceMap::SendResetWarnings(uint32 timeLeft) const { - for (MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefMgr::const_iterator itr = m_mapRefMgr.begin(); itr != m_mapRefMgr.end(); ++itr) itr->GetSource()->SendInstanceResetWarning(GetId(), itr->GetSource()->GetDifficulty(IsRaid()), timeLeft, false); } @@ -3213,7 +3213,7 @@ void BattlegroundMap::SetUnload() void BattlegroundMap::RemoveAllPlayers() { if (HavePlayers()) - for (MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr) + for (MapRefMgr::iterator itr = m_mapRefMgr.begin(); itr != m_mapRefMgr.end(); ++itr) if (Player* player = itr->GetSource()) if (!player->IsBeingTeleportedFar()) player->TeleportTo(player->GetEntryPoint()); @@ -3851,7 +3851,7 @@ bool Map::CheckCollisionAndGetValidCoords(const WorldObject* source, float start // Unit is not on the ground, check for potential collision via vmaps if (notOnGround) { - bool col = VMAP::VMapFactory::createOrGetVMapManager()->GetObjectHitPos(source->GetMapId(), + bool col = VMAP::VMapFactory::createOrGetVMapMgr()->GetObjectHitPos(source->GetMapId(), startX, startY, startZ + halfHeight, destX, destY, destZ + halfHeight, destX, destY, destZ, -CONTACT_DISTANCE); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index aaa73425f..a767d5e6f 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -14,8 +14,8 @@ #include "DynamicTree.h" #include "GameObjectModel.h" #include "GridDefines.h" -#include "GridRefManager.h" -#include "MapRefManager.h" +#include "GridRefMgr.h" +#include "MapRefMgr.h" #include "ObjectDefines.h" #include "ObjectGuid.h" #include "PathGenerator.h" @@ -284,7 +284,7 @@ enum EncounterCreditType ENCOUNTER_CREDIT_CAST_SPELL = 1, }; -class Map : public GridRefManager +class Map : public GridRefMgr { friend class MapReference; public: @@ -447,7 +447,7 @@ public: bool isCellMarkedLarge(uint32 pCellId) { return marked_cells_large.test(pCellId); } void markCellLarge(uint32 pCellId) { marked_cells_large.set(pCellId); } - [[nodiscard]] bool HavePlayers() const { return !m_mapRefManager.isEmpty(); } + [[nodiscard]] bool HavePlayers() const { return !m_mapRefMgr.isEmpty(); } [[nodiscard]] uint32 GetPlayersCountExceptGMs() const; void AddWorldObject(WorldObject* obj) { i_worldObjects.insert(obj); } @@ -455,8 +455,8 @@ public: void SendToPlayers(WorldPacket const* data) const; - typedef MapRefManager PlayerList; - [[nodiscard]] PlayerList const& GetPlayers() const { return m_mapRefManager; } + typedef MapRefMgr PlayerList; + [[nodiscard]] PlayerList const& GetPlayers() const { return m_mapRefMgr; } //per-map script storage void ScriptsStart(std::map > const& scripts, uint32 id, Object* source, Object* target); @@ -671,8 +671,8 @@ protected: DynamicMapTree _dynamicTree; time_t _instanceResetPeriod; // pussywizard - MapRefManager m_mapRefManager; - MapRefManager::iterator m_mapRefIter; + MapRefMgr m_mapRefMgr; + MapRefMgr::iterator m_mapRefIter; typedef std::set ActiveNonPlayers; ActiveNonPlayers m_activeNonPlayers; diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp index 3bb9c612a..f988a5ad1 100644 --- a/src/server/game/Maps/MapInstanced.cpp +++ b/src/server/game/Maps/MapInstanced.cpp @@ -8,7 +8,7 @@ #include "Group.h" #include "InstanceSaveMgr.h" #include "MapInstanced.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MMapFactory.h" #include "ObjectMgr.h" #include "Player.h" diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h index d39fade5f..2541ee5d6 100644 --- a/src/server/game/Maps/MapInstanced.h +++ b/src/server/game/Maps/MapInstanced.h @@ -13,7 +13,7 @@ class MapInstanced : public Map { - friend class MapManager; + friend class MapMgr; public: typedef std::unordered_map< uint32, Map*> InstancedMaps; diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapMgr.cpp similarity index 91% rename from src/server/game/Maps/MapManager.cpp rename to src/server/game/Maps/MapMgr.cpp index 72d1db8bb..942d61271 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapMgr.cpp @@ -15,7 +15,7 @@ #include "LFGMgr.h" #include "Log.h" #include "MapInstanced.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -29,24 +29,24 @@ #include "LuaEngine.h" #endif -MapManager::MapManager() +MapMgr::MapMgr() { i_timer[3].SetInterval(sWorld->getIntConfig(CONFIG_INTERVAL_MAPUPDATE)); mapUpdateStep = 0; _nextInstanceId = 0; } -MapManager::~MapManager() +MapMgr::~MapMgr() { } -MapManager* MapManager::instance() +MapMgr* MapMgr::instance() { - static MapManager instance; + static MapMgr instance; return &instance; } -void MapManager::Initialize() +void MapMgr::Initialize() { int num_threads(sWorld->getIntConfig(CONFIG_NUMTHREADS)); @@ -55,13 +55,13 @@ void MapManager::Initialize() m_updater.activate(num_threads); } -void MapManager::InitializeVisibilityDistanceInfo() +void MapMgr::InitializeVisibilityDistanceInfo() { for (MapMapType::iterator iter = i_maps.begin(); iter != i_maps.end(); ++iter) (*iter).second->InitVisibilityDistance(); } -Map* MapManager::CreateBaseMap(uint32 id) +Map* MapMgr::CreateBaseMap(uint32 id) { Map* map = FindBaseMap(id); @@ -92,7 +92,7 @@ Map* MapManager::CreateBaseMap(uint32 id) return map; } -Map* MapManager::FindBaseNonInstanceMap(uint32 mapId) const +Map* MapMgr::FindBaseNonInstanceMap(uint32 mapId) const { Map* map = FindBaseMap(mapId); if (map && map->Instanceable()) @@ -100,7 +100,7 @@ Map* MapManager::FindBaseNonInstanceMap(uint32 mapId) const return map; } -Map* MapManager::CreateMap(uint32 id, Player* player) +Map* MapMgr::CreateMap(uint32 id, Player* player) { Map* m = CreateBaseMap(id); @@ -110,7 +110,7 @@ Map* MapManager::CreateMap(uint32 id, Player* player) return m; } -Map* MapManager::FindMap(uint32 mapid, uint32 instanceId) const +Map* MapMgr::FindMap(uint32 mapid, uint32 instanceId) const { Map* map = FindBaseMap(mapid); if (!map) @@ -122,7 +122,7 @@ Map* MapManager::FindMap(uint32 mapid, uint32 instanceId) const return ((MapInstanced*)map)->FindInstanceMap(instanceId); } -Map::EnterState MapManager::PlayerCannotEnter(uint32 mapid, Player* player, bool loginCheck) +Map::EnterState MapMgr::PlayerCannotEnter(uint32 mapid, Player* player, bool loginCheck) { MapEntry const* entry = sMapStore.LookupEntry(mapid); if (!entry) @@ -236,7 +236,7 @@ Map::EnterState MapManager::PlayerCannotEnter(uint32 mapid, Player* player, bool return player->Satisfy(sObjectMgr->GetAccessRequirement(mapid, targetDifficulty), mapid, true) ? Map::CAN_ENTER : Map::CANNOT_ENTER_UNSPECIFIED_REASON; } -void MapManager::Update(uint32 diff) +void MapMgr::Update(uint32 diff) { for (uint8 i = 0; i < 4; ++i) i_timer[i].Update(diff); @@ -288,11 +288,11 @@ void MapManager::Update(uint32 diff) } } -void MapManager::DoDelayedMovesAndRemoves() +void MapMgr::DoDelayedMovesAndRemoves() { } -bool MapManager::ExistMapAndVMap(uint32 mapid, float x, float y) +bool MapMgr::ExistMapAndVMap(uint32 mapid, float x, float y) { GridCoord p = Acore::ComputeGridCoord(x, y); @@ -302,7 +302,7 @@ bool MapManager::ExistMapAndVMap(uint32 mapid, float x, float y) return Map::ExistMap(mapid, gx, gy) && Map::ExistVMap(mapid, gx, gy); } -bool MapManager::IsValidMAP(uint32 mapid, bool startUp) +bool MapMgr::IsValidMAP(uint32 mapid, bool startUp) { MapEntry const* mEntry = sMapStore.LookupEntry(mapid); @@ -318,7 +318,7 @@ bool MapManager::IsValidMAP(uint32 mapid, bool startUp) // TODO: add check for battleground template } -void MapManager::UnloadAll() +void MapMgr::UnloadAll() { for (MapMapType::iterator iter = i_maps.begin(); iter != i_maps.end();) { @@ -331,7 +331,7 @@ void MapManager::UnloadAll() m_updater.deactivate(); } -void MapManager::GetNumInstances(uint32& dungeons, uint32& battlegrounds, uint32& arenas) +void MapMgr::GetNumInstances(uint32& dungeons, uint32& battlegrounds, uint32& arenas) { for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr) { @@ -348,7 +348,7 @@ void MapManager::GetNumInstances(uint32& dungeons, uint32& battlegrounds, uint32 } } -void MapManager::GetNumPlayersInInstances(uint32& dungeons, uint32& battlegrounds, uint32& arenas, uint32& spectators) +void MapMgr::GetNumPlayersInInstances(uint32& dungeons, uint32& battlegrounds, uint32& arenas, uint32& spectators) { for (MapMapType::iterator itr = i_maps.begin(); itr != i_maps.end(); ++itr) { @@ -374,7 +374,7 @@ void MapManager::GetNumPlayersInInstances(uint32& dungeons, uint32& battleground } } -void MapManager::InitInstanceIds() +void MapMgr::InitInstanceIds() { _nextInstanceId = 1; @@ -386,7 +386,7 @@ void MapManager::InitInstanceIds() } } -void MapManager::RegisterInstanceId(uint32 instanceId) +void MapMgr::RegisterInstanceId(uint32 instanceId) { // Allocation was done in InitInstanceIds() _instanceIds[instanceId] = true; @@ -397,7 +397,7 @@ void MapManager::RegisterInstanceId(uint32 instanceId) ++_nextInstanceId; } -uint32 MapManager::GenerateInstanceId() +uint32 MapMgr::GenerateInstanceId() { uint32 newInstanceId = _nextInstanceId; diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapMgr.h similarity index 91% rename from src/server/game/Maps/MapManager.h rename to src/server/game/Maps/MapMgr.h index 4668010e4..37af5c23c 100644 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapMgr.h @@ -21,10 +21,10 @@ class StaticTransport; class MotionTransport; struct TransportCreatureProto; -class MapManager +class MapMgr { public: - static MapManager* instance(); + static MapMgr* instance(); Map* CreateBaseMap(uint32 mapId); Map* FindBaseNonInstanceMap(uint32 mapId) const; @@ -39,7 +39,7 @@ public: [[nodiscard]] uint32 GetAreaId(uint32 phaseMask, uint32 mapid, float x, float y, float z) const { - Map const* m = const_cast(this)->CreateBaseMap(mapid); + Map const* m = const_cast(this)->CreateBaseMap(mapid); return m->GetAreaId(phaseMask, x, y, z); } [[nodiscard]] uint32 GetAreaId(uint32 phaseMask, uint32 mapid, Position const& pos) const { return GetAreaId(phaseMask, mapid, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ()); } @@ -47,7 +47,7 @@ public: [[nodiscard]] uint32 GetZoneId(uint32 phaseMask, uint32 mapid, float x, float y, float z) const { - Map const* m = const_cast(this)->CreateBaseMap(mapid); + Map const* m = const_cast(this)->CreateBaseMap(mapid); return m->GetZoneId(phaseMask, x, y, z); } [[nodiscard]] uint32 GetZoneId(uint32 phaseMask, uint32 mapid, Position const& pos) const { return GetZoneId(phaseMask, mapid, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ()); } @@ -55,7 +55,7 @@ public: void GetZoneAndAreaId(uint32 phaseMask, uint32& zoneid, uint32& areaid, uint32 mapid, float x, float y, float z) { - Map const* m = const_cast(this)->CreateBaseMap(mapid); + Map const* m = const_cast(this)->CreateBaseMap(mapid); m->GetZoneAndAreaId(phaseMask, zoneid, areaid, x, y, z); } @@ -143,11 +143,11 @@ private: typedef std::unordered_map MapMapType; typedef std::vector InstanceIds; - MapManager(); - ~MapManager(); + MapMgr(); + ~MapMgr(); - MapManager(const MapManager&); - MapManager& operator=(const MapManager&); + MapMgr(const MapMgr&); + MapMgr& operator=(const MapMgr&); std::mutex Lock; MapMapType i_maps; @@ -160,7 +160,7 @@ private: }; template -void MapManager::DoForAllMaps(Worker&& worker) +void MapMgr::DoForAllMaps(Worker&& worker) { std::lock_guard guard(Lock); @@ -179,7 +179,7 @@ void MapManager::DoForAllMaps(Worker&& worker) } template -inline void MapManager::DoForAllMapsWithMapId(uint32 mapId, Worker&& worker) +inline void MapMgr::DoForAllMapsWithMapId(uint32 mapId, Worker&& worker) { std::lock_guard guard(Lock); @@ -198,6 +198,6 @@ inline void MapManager::DoForAllMapsWithMapId(uint32 mapId, Worker&& worker) } } -#define sMapMgr MapManager::instance() +#define sMapMgr MapMgr::instance() #endif diff --git a/src/server/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefMgr.h similarity index 74% rename from src/server/game/Maps/MapRefManager.h rename to src/server/game/Maps/MapRefMgr.h index 3e7e21c5e..caf2dbb91 100644 --- a/src/server/game/Maps/MapRefManager.h +++ b/src/server/game/Maps/MapRefMgr.h @@ -7,20 +7,20 @@ #ifndef _MAPREFMANAGER #define _MAPREFMANAGER -#include "RefManager.h" +#include "RefMgr.h" class MapReference; -class MapRefManager : public RefManager +class MapRefMgr : public RefMgr { public: typedef LinkedListHead::Iterator< MapReference > iterator; typedef LinkedListHead::Iterator< MapReference const > const_iterator; - MapReference* getFirst() { return (MapReference*)RefManager::getFirst(); } - [[nodiscard]] MapReference const* getFirst() const { return (MapReference const*)RefManager::getFirst(); } - MapReference* getLast() { return (MapReference*)RefManager::getLast(); } - [[nodiscard]] MapReference const* getLast() const { return (MapReference const*)RefManager::getLast(); } + MapReference* getFirst() { return (MapReference*)RefMgr::getFirst(); } + [[nodiscard]] MapReference const* getFirst() const { return (MapReference const*)RefMgr::getFirst(); } + MapReference* getLast() { return (MapReference*)RefMgr::getLast(); } + [[nodiscard]] MapReference const* getLast() const { return (MapReference const*)RefMgr::getLast(); } iterator begin() { return iterator(getFirst()); } iterator end() { return iterator(nullptr); } diff --git a/src/server/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h index 258afcec2..765590a78 100644 --- a/src/server/game/Maps/MapReference.h +++ b/src/server/game/Maps/MapReference.h @@ -16,18 +16,18 @@ protected: void targetObjectBuildLink() override { // called from link() - getTarget()->m_mapRefManager.insertFirst(this); - getTarget()->m_mapRefManager.incSize(); + getTarget()->m_mapRefMgr.insertFirst(this); + getTarget()->m_mapRefMgr.incSize(); } void targetObjectDestroyLink() override { // called from unlink() - if (isValid()) getTarget()->m_mapRefManager.decSize(); + if (isValid()) getTarget()->m_mapRefMgr.decSize(); } void sourceObjectDestroyLink() override { // called from invalidate() - getTarget()->m_mapRefManager.decSize(); + getTarget()->m_mapRefMgr.decSize(); } public: MapReference() : Reference() {} diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp index 0a5b504e5..ffed48641 100644 --- a/src/server/game/Maps/TransportMgr.cpp +++ b/src/server/game/Maps/TransportMgr.cpp @@ -5,7 +5,7 @@ */ #include "InstanceScript.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MoveSpline.h" #include "Transport.h" #include "TransportMgr.h" diff --git a/src/server/game/Misc/BanManager.cpp b/src/server/game/Misc/BanMgr.cpp similarity index 92% rename from src/server/game/Misc/BanManager.cpp rename to src/server/game/Misc/BanMgr.cpp index f543badc4..e54146894 100644 --- a/src/server/game/Misc/BanManager.cpp +++ b/src/server/game/Misc/BanMgr.cpp @@ -3,7 +3,7 @@ */ #include "AccountMgr.h" -#include "BanManager.h" +#include "BanMgr.h" #include "DatabaseEnv.h" #include "Language.h" #include "ObjectAccessor.h" @@ -13,14 +13,14 @@ #include "World.h" #include "WorldSession.h" -BanManager* BanManager::instance() +BanMgr* BanMgr::instance() { - static BanManager instance; + static BanMgr instance; return &instance; } /// Ban an account, duration will be parsed using TimeStringToSecs if it is positive, otherwise permban -BanReturn BanManager::BanAccount(std::string const& AccountName, std::string const& Duration, std::string const& Reason, std::string const& Author) +BanReturn BanMgr::BanAccount(std::string const& AccountName, std::string const& Duration, std::string const& Reason, std::string const& Author) { if (AccountName.empty() || Duration.empty()) return BAN_SYNTAX_ERROR; @@ -82,7 +82,7 @@ BanReturn BanManager::BanAccount(std::string const& AccountName, std::string con } /// Ban an account by player name, duration will be parsed using TimeStringToSecs if it is positive, otherwise permban -BanReturn BanManager::BanAccountByPlayerName(std::string const& CharacterName, std::string const& Duration, std::string const& Reason, std::string const& Author) +BanReturn BanMgr::BanAccountByPlayerName(std::string const& CharacterName, std::string const& Duration, std::string const& Reason, std::string const& Author) { if (CharacterName.empty() || Duration.empty()) return BAN_SYNTAX_ERROR; @@ -148,7 +148,7 @@ BanReturn BanManager::BanAccountByPlayerName(std::string const& CharacterName, s } /// Ban an IP address, duration will be parsed using TimeStringToSecs if it is positive, otherwise permban -BanReturn BanManager::BanIP(std::string const& IP, std::string const& Duration, std::string const& Reason, std::string const& Author) +BanReturn BanMgr::BanIP(std::string const& IP, std::string const& Duration, std::string const& Reason, std::string const& Author) { if (IP.empty() || Duration.empty()) return BAN_SYNTAX_ERROR; @@ -206,7 +206,7 @@ BanReturn BanManager::BanIP(std::string const& IP, std::string const& Duration, } /// Ban an character, duration will be parsed using TimeStringToSecs if it is positive, otherwise permban -BanReturn BanManager::BanCharacter(std::string const& CharacterName, std::string const& Duration, std::string const& Reason, std::string const& Author) +BanReturn BanMgr::BanCharacter(std::string const& CharacterName, std::string const& Duration, std::string const& Reason, std::string const& Author) { Player* target = ObjectAccessor::FindPlayerByName(CharacterName, false); uint32 DurationSecs = TimeStringToSecs(Duration); @@ -254,7 +254,7 @@ BanReturn BanManager::BanCharacter(std::string const& CharacterName, std::string } /// Remove a ban from an account -bool BanManager::RemoveBanAccount(std::string const& AccountName) +bool BanMgr::RemoveBanAccount(std::string const& AccountName) { uint32 AccountID = AccountMgr::GetId(AccountName); if (!AccountID) @@ -269,7 +269,7 @@ bool BanManager::RemoveBanAccount(std::string const& AccountName) } /// Remove a ban from an player name -bool BanManager::RemoveBanAccountByPlayerName(std::string const& CharacterName) +bool BanMgr::RemoveBanAccountByPlayerName(std::string const& CharacterName) { uint32 AccountID = sObjectMgr->GetPlayerAccountIdByPlayerName(CharacterName); if (!AccountID) @@ -284,7 +284,7 @@ bool BanManager::RemoveBanAccountByPlayerName(std::string const& CharacterName) } /// Remove a ban from an account -bool BanManager::RemoveBanIP(std::string const& IP) +bool BanMgr::RemoveBanIP(std::string const& IP) { LoginDatabasePreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_DEL_IP_NOT_BANNED); stmt->setString(0, IP); @@ -294,7 +294,7 @@ bool BanManager::RemoveBanIP(std::string const& IP) } /// Remove a ban from a character -bool BanManager::RemoveBanCharacter(std::string const& CharacterName) +bool BanMgr::RemoveBanCharacter(std::string const& CharacterName) { Player* pBanned = ObjectAccessor::FindPlayerByName(CharacterName, false); ObjectGuid guid; diff --git a/src/server/game/Misc/BanManager.h b/src/server/game/Misc/BanMgr.h similarity index 93% rename from src/server/game/Misc/BanManager.h rename to src/server/game/Misc/BanMgr.h index 40baebe18..e599ee725 100644 --- a/src/server/game/Misc/BanManager.h +++ b/src/server/game/Misc/BanMgr.h @@ -16,10 +16,10 @@ enum BanReturn BAN_LONGER_EXISTS }; -class BanManager +class BanMgr { public: - static BanManager* instance(); + static BanMgr* instance(); BanReturn BanAccount(std::string const& AccountName, std::string const& Duration, std::string const& Reason, std::string const& Author); BanReturn BanAccountByPlayerName(std::string const& CharacterName, std::string const& Duration, std::string const& Reason, std::string const& Author); @@ -32,6 +32,6 @@ public: bool RemoveBanCharacter(std::string const& CharacterName); }; -#define sBan BanManager::instance() +#define sBan BanMgr::instance() #endif // _BAN_MANAGER_H diff --git a/src/server/game/Misc/GameGraveyard.cpp b/src/server/game/Misc/GameGraveyard.cpp index fa4dc2878..e03fb4b73 100644 --- a/src/server/game/Misc/GameGraveyard.cpp +++ b/src/server/game/Misc/GameGraveyard.cpp @@ -6,7 +6,7 @@ #include "DBCStores.h" #include "GameGraveyard.h" #include "Log.h" -#include "MapManager.h" +#include "MapMgr.h" Graveyard* Graveyard::instance() { diff --git a/src/server/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefMgr.h similarity index 81% rename from src/server/game/Movement/FollowerRefManager.h rename to src/server/game/Movement/FollowerRefMgr.h index 45401df7d..176e28baf 100644 --- a/src/server/game/Movement/FollowerRefManager.h +++ b/src/server/game/Movement/FollowerRefMgr.h @@ -7,12 +7,12 @@ #ifndef _FOLLOWERREFMANAGER #define _FOLLOWERREFMANAGER -#include "RefManager.h" +#include "RefMgr.h" class Unit; class TargetedMovementGeneratorBase; -class FollowerRefManager : public RefManager +class FollowerRefMgr : public RefMgr { }; #endif diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp index ced185c26..4323c85f9 100644 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp @@ -6,7 +6,7 @@ #include "ConfusedMovementGenerator.h" #include "Creature.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MoveSpline.h" #include "MoveSplineInit.h" #include "Player.h" diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index 6f11373b4..10262c7b6 100644 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -7,7 +7,7 @@ #include "Creature.h" #include "CreatureAI.h" #include "FleeingMovementGenerator.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MoveSplineInit.h" #include "ObjectAccessor.h" #include "Player.h" diff --git a/src/server/game/Movement/MovementGenerators/PathGenerator.cpp b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp index 84d8c800e..f5cc73647 100644 --- a/src/server/game/Movement/MovementGenerators/PathGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp @@ -10,7 +10,7 @@ #include "Log.h" #include "Map.h" #include "MMapFactory.h" -#include "MMapManager.h" +#include "MMapMgr.h" #include "PathGenerator.h" ////////////////// PathGenerator ////////////////// @@ -25,7 +25,7 @@ PathGenerator::PathGenerator(WorldObject const* owner) : uint32 mapId = _source->GetMapId(); //if (DisableMgr::IsPathfindingEnabled(_sourceUnit->FindMap())) { - MMAP::MMapManager* mmap = MMAP::MMapFactory::createOrGetMMapManager(); + MMAP::MMapMgr* mmap = MMAP::MMapFactory::createOrGetMMapMgr(); _navMesh = mmap->GetNavMesh(mapId); _navMeshQuery = mmap->GetNavMeshQuery(mapId, _source->GetInstanceId()); } diff --git a/src/server/game/Movement/MovementGenerators/PathGenerator.h b/src/server/game/Movement/MovementGenerators/PathGenerator.h index 40abfa357..907ba3502 100644 --- a/src/server/game/Movement/MovementGenerators/PathGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PathGenerator.h @@ -11,7 +11,7 @@ #include "DetourNavMeshQuery.h" #include "MapDefines.h" #include "MMapFactory.h" -#include "MMapManager.h" +#include "MMapMgr.h" #include "MoveSplineInitArgs.h" #include "SharedDefines.h" #include diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index b7f595ad4..9717433e1 100644 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -5,7 +5,7 @@ #include "Creature.h" #include "CreatureGroups.h" #include "Map.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MoveSpline.h" #include "MoveSplineInit.h" #include "ObjectAccessor.h" diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index 35876ee59..ea5220a41 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -7,7 +7,7 @@ #include "Creature.h" #include "CreatureAI.h" #include "CreatureGroups.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MoveSpline.h" #include "MoveSplineInit.h" #include "ObjectMgr.h" @@ -310,7 +310,7 @@ void FlightPathMovementGenerator::DoFinalize(Player* player) if (player->m_taxi.empty()) { - player->getHostileRefManager().setOnlineOfflineState(true); + player->getHostileRefMgr().setOnlineOfflineState(true); // update z position to ground and orientation for landing point // this prevent cheating with landing point at lags // when client side flight end early in comparison server side @@ -325,7 +325,7 @@ void FlightPathMovementGenerator::DoFinalize(Player* player) void FlightPathMovementGenerator::DoReset(Player* player) { - player->getHostileRefManager().setOnlineOfflineState(false); + player->getHostileRefMgr().setOnlineOfflineState(false); player->AddUnitState(UNIT_STATE_IN_FLIGHT); player->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT); diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index 2cc58798b..600a19a8d 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -15,7 +15,7 @@ #include "MovementGenerator.h" #include "Player.h" -#include "WaypointManager.h" +#include "WaypointMgr.h" #define FLIGHT_TRAVEL_UPDATE 100 #define TIMEDIFF_NEXT_WP 250 diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointMgr.cpp similarity index 99% rename from src/server/game/Movement/Waypoints/WaypointManager.cpp rename to src/server/game/Movement/Waypoints/WaypointMgr.cpp index dd4bc1035..23b20ada4 100644 --- a/src/server/game/Movement/Waypoints/WaypointManager.cpp +++ b/src/server/game/Movement/Waypoints/WaypointMgr.cpp @@ -7,7 +7,7 @@ #include "DatabaseEnv.h" #include "GridDefines.h" #include "Log.h" -#include "WaypointManager.h" +#include "WaypointMgr.h" WaypointMgr::WaypointMgr() { diff --git a/src/server/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointMgr.h similarity index 100% rename from src/server/game/Movement/Waypoints/WaypointManager.h rename to src/server/game/Movement/Waypoints/WaypointMgr.h diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index 7e1ddc79a..37cef4c44 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -9,7 +9,7 @@ #include "GridNotifiersImpl.h" #include "Group.h" #include "Map.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "OutdoorPvP.h" diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index 30f37a3fe..18fbc104b 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -6,7 +6,7 @@ #include "Containers.h" #include "Log.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "PoolMgr.h" #include "Transport.h" diff --git a/src/server/game/PrecompiledHeaders/gamePCH.h b/src/server/game/PrecompiledHeaders/gamePCH.h index 047a26b26..7e33c4187 100644 --- a/src/server/game/PrecompiledHeaders/gamePCH.h +++ b/src/server/game/PrecompiledHeaders/gamePCH.h @@ -6,7 +6,7 @@ #include "Common.h" #include "Log.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectDefines.h" #include "ObjectMgr.h" diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index 30426dfd7..43bdfb277 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -8,14 +8,14 @@ #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "Map.h" -#include "MapManager.h" -#include "MapRefManager.h" +#include "MapMgr.h" +#include "MapRefMgr.h" #include "ObjectMgr.h" #include "Pet.h" #include "ScriptedCreature.h" #include "ScriptMgr.h" #include "Transport.h" -#include "WaypointManager.h" +#include "WaypointMgr.h" #include "World.h" /// Put scripts in the execution queue diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 2d3837bbd..8e92f6171 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -17,7 +17,7 @@ #include "Guild.h" #include "GuildMgr.h" #include "Log.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -524,7 +524,7 @@ void WorldSession::LogoutPlayer(bool save) //FIXME: logout must be delayed in case lost connection with client in time of combat if (_player->GetDeathTimer()) { - _player->getHostileRefManager().deleteReferences(); + _player->getHostileRefMgr().deleteReferences(); _player->BuildPlayerRepop(); _player->RepopAtGraveyard(); } diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 9f605c6e1..6e4f4e570 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -14,7 +14,7 @@ #include "AccountMgr.h" #include "AuthDefines.h" #include "AddonMgr.h" -#include "BanManager.h" +#include "BanMgr.h" #include "CircularBuffer.h" #include "Common.h" #include "DatabaseEnv.h" diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 0be7cbe4d..caf2f8af6 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -2435,13 +2435,13 @@ void AuraEffect::HandleFeignDeath(AuraApplication const* aurApp, uint8 mode, boo // Xinef: replaced with CombatStop(false) target->AttackStop(); target->RemoveAllAttackers(); - target->getHostileRefManager().addThreatPercent(-100); + target->getHostileRefMgr().addThreatPercent(-100); target->ToPlayer()->SendAttackSwingCancelAttack(); // melee and ranged forced attack cancel } else { target->CombatStop(); - target->getHostileRefManager().deleteReferences(); + target->getHostileRefMgr().deleteReferences(); } target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION); @@ -2999,7 +2999,7 @@ void AuraEffect::HandleAuraModTotalThreat(AuraApplication const* aurApp, uint8 m Unit* caster = GetCaster(); if (caster && caster->IsAlive()) - target->getHostileRefManager().addTempThreat((float)GetAmount(), apply); + target->getHostileRefMgr().addTempThreat((float)GetAmount(), apply); } void AuraEffect::HandleModTaunt(AuraApplication const* aurApp, uint8 mode, bool apply) const @@ -6435,7 +6435,7 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c heal = uint32(caster->SpellHealingBonusTaken(caster, GetSpellInfo(), heal, DOT, GetBase()->GetStackAmount())); int32 gain = caster->HealBySpell(caster, GetSpellInfo(), heal); - caster->getHostileRefManager().threatAssist(caster, gain * 0.5f, GetSpellInfo()); + caster->getHostileRefMgr().threatAssist(caster, gain * 0.5f, GetSpellInfo()); } void AuraEffect::HandlePeriodicHealthFunnelAuraTick(Unit* target, Unit* caster) const @@ -6573,7 +6573,7 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const target->SendPeriodicAuraLog(&pInfo); if (caster) - target->getHostileRefManager().threatAssist(caster, float(gain) * 0.5f, GetSpellInfo()); + target->getHostileRefMgr().threatAssist(caster, float(gain) * 0.5f, GetSpellInfo()); bool haveCastItem = GetBase()->GetCastItemGUID(); @@ -6711,7 +6711,7 @@ void AuraEffect::HandleObsModPowerAuraTick(Unit* target, Unit* caster) const int32 gain = target->ModifyPower(PowerType, amount); if (caster) - target->getHostileRefManager().threatAssist(caster, float(gain) * 0.5f, GetSpellInfo()); + target->getHostileRefMgr().threatAssist(caster, float(gain) * 0.5f, GetSpellInfo()); } void AuraEffect::HandlePeriodicEnergizeAuraTick(Unit* target, Unit* caster) const @@ -6745,7 +6745,7 @@ void AuraEffect::HandlePeriodicEnergizeAuraTick(Unit* target, Unit* caster) cons int32 gain = target->ModifyPower(PowerType, amount); if (caster) - target->getHostileRefManager().threatAssist(caster, float(gain) * 0.5f, GetSpellInfo()); + target->getHostileRefMgr().threatAssist(caster, float(gain) * 0.5f, GetSpellInfo()); } void AuraEffect::HandlePeriodicPowerBurnAuraTick(Unit* target, Unit* caster) const diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 2e4cb0934..f2169de5f 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -26,9 +26,9 @@ #include "InstanceScript.h" #include "Log.h" #include "LootMgr.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MMapFactory.h" -#include "MMapManager.h" +#include "MMapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -2567,7 +2567,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) } int32 gain = caster->HealBySpell(unitTarget, m_spellInfo, addhealth, crit); - unitTarget->getHostileRefManager().threatAssist(caster, float(gain) * 0.5f, m_spellInfo); + unitTarget->getHostileRefMgr().threatAssist(caster, float(gain) * 0.5f, m_spellInfo); m_healing = gain; // Xinef: if heal acutally healed something, add no overheal flag @@ -2826,7 +2826,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA if (unit->IsInCombat() && !m_spellInfo->HasAttribute(SPELL_ATTR3_SUPRESS_TARGET_PROCS) && !m_triggeredByAuraSpell) { m_caster->SetInCombatState(unit->GetCombatTimer() > 0, unit); - unit->getHostileRefManager().threatAssist(m_caster, 0.0f); + unit->getHostileRefMgr().threatAssist(m_caster, 0.0f); } } } @@ -5149,7 +5149,7 @@ void Spell::HandleThreatSpells() bool IsFriendly = m_caster->IsFriendlyTo(target); // positive spells distribute threat among all units that are in combat with target, like healing if (m_spellInfo->_IsPositiveSpell() && IsFriendly) - target->getHostileRefManager().threatAssist(m_caster, threatToAdd, m_spellInfo); + target->getHostileRefMgr().threatAssist(m_caster, threatToAdd, m_spellInfo); // for negative spells threat gets distributed among affected targets else if (!m_spellInfo->_IsPositiveSpell() && !IsFriendly && target->CanHaveThreatList()) target->AddThreat(m_caster, threatToAdd, m_spellInfo->GetSchoolMask(), m_spellInfo); @@ -5239,7 +5239,7 @@ SpellCastResult Spell::CheckCast(bool strict) if (bg->GetStatus() == STATUS_WAIT_LEAVE) return SPELL_FAILED_DONT_REPORT; - if (m_caster->GetTypeId() == TYPEID_PLAYER /*&& VMAP::VMapFactory::createOrGetVMapManager()->isLineOfSightCalcEnabled()*/) // pussywizard: optimization (commented) + if (m_caster->GetTypeId() == TYPEID_PLAYER /*&& VMAP::VMapFactory::createOrGetVMapMgr()->isLineOfSightCalcEnabled()*/) // pussywizard: optimization (commented) { if (m_spellInfo->HasAttribute(SPELL_ATTR0_ONLY_OUTDOORS) && !m_caster->IsOutdoors()) diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index c21ec73db..939007930 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -23,7 +23,7 @@ #include "InstanceScript.h" #include "Language.h" #include "Log.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -2628,7 +2628,7 @@ void Spell::EffectDispel(SpellEffIndex effIndex) // put in combat if (unitTarget->IsFriendlyTo(m_caster)) - unitTarget->getHostileRefManager().threatAssist(m_caster, 0.0f, m_spellInfo); + unitTarget->getHostileRefMgr().threatAssist(m_caster, 0.0f, m_spellInfo); if (success_list.empty()) return; @@ -3270,17 +3270,17 @@ void Spell::EffectTaunt(SpellEffIndex /*effIndex*/) return; } - if (!unitTarget->getThreatManager().getOnlineContainer().empty()) + if (!unitTarget->getThreatMgr().getOnlineContainer().empty()) { // Also use this effect to set the taunter's threat to the taunted creature's highest value - float myThreat = unitTarget->getThreatManager().getThreat(m_caster); - float topThreat = unitTarget->getThreatManager().getOnlineContainer().getMostHated()->getThreat(); + float myThreat = unitTarget->getThreatMgr().getThreat(m_caster); + float topThreat = unitTarget->getThreatMgr().getOnlineContainer().getMostHated()->getThreat(); if (topThreat > myThreat) - unitTarget->getThreatManager().doAddThreat(m_caster, topThreat - myThreat); + unitTarget->getThreatMgr().doAddThreat(m_caster, topThreat - myThreat); //Set aggro victim to caster - if (HostileReference* forcedVictim = unitTarget->getThreatManager().getOnlineContainer().getReferenceByTarget(m_caster)) - unitTarget->getThreatManager().setCurrentVictim(forcedVictim); + if (HostileReference* forcedVictim = unitTarget->getThreatMgr().getOnlineContainer().getReferenceByTarget(m_caster)) + unitTarget->getThreatMgr().setCurrentVictim(forcedVictim); } if (unitTarget->ToCreature()->IsAIEnabled && !unitTarget->ToCreature()->HasReactState(REACT_PASSIVE)) @@ -4230,21 +4230,21 @@ void Spell::EffectSanctuary(SpellEffIndex /*effIndex*/) if (unitTarget->GetInstanceScript() && unitTarget->GetInstanceScript()->IsEncounterInProgress()) { - unitTarget->getHostileRefManager().UpdateVisibility(true); + unitTarget->getHostileRefMgr().UpdateVisibility(true); // Xinef: replaced with CombatStop(false) unitTarget->AttackStop(); unitTarget->RemoveAllAttackers(); // Night Elf: Shadowmeld only resets threat temporarily if (m_spellInfo->Id != 59646) - unitTarget->getHostileRefManager().addThreatPercent(-100); + unitTarget->getHostileRefMgr().addThreatPercent(-100); if (unitTarget->GetTypeId() == TYPEID_PLAYER) unitTarget->ToPlayer()->SendAttackSwingCancelAttack(); // melee and ranged forced attack cancel } else { - unitTarget->getHostileRefManager().UpdateVisibility(m_spellInfo->Id == 59646); // Night Elf: Shadowmeld + unitTarget->getHostileRefMgr().UpdateVisibility(m_spellInfo->Id == 59646); // Night Elf: Shadowmeld unitTarget->CombatStop(true); } @@ -5327,7 +5327,7 @@ void Spell::EffectDispelMechanic(SpellEffIndex effIndex) // put in combat if (unitTarget->IsFriendlyTo(m_caster)) - unitTarget->getHostileRefManager().threatAssist(m_caster, 0.0f, m_spellInfo); + unitTarget->getHostileRefMgr().threatAssist(m_caster, 0.0f, m_spellInfo); } void Spell::EffectResurrectPet(SpellEffIndex /*effIndex*/) @@ -5467,7 +5467,7 @@ void Spell::EffectModifyThreatPercent(SpellEffIndex /*effIndex*/) if (!unitTarget) return; - unitTarget->getThreatManager().modifyThreatPercent(m_caster, damage); + unitTarget->getThreatMgr().modifyThreatPercent(m_caster, damage); } void Spell::EffectTransmitted(SpellEffIndex effIndex) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 16358c0f4..a9479137f 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -12,7 +12,7 @@ #include "DBCStores.h" #include "GameGraveyard.h" #include "InstanceScript.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Player.h" #include "SharedDefines.h" diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp index ab3f315f9..f13f31914 100644 --- a/src/server/game/Warden/Warden.cpp +++ b/src/server/game/Warden/Warden.cpp @@ -5,7 +5,7 @@ */ #include "AccountMgr.h" -#include "BanManager.h" +#include "BanMgr.h" #include "ByteBuffer.h" #include "Common.h" #include "Log.h" diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 4bc56d3c9..363f8e81b 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -48,7 +48,7 @@ #include "LootItemStorage.h" #include "LootMgr.h" #include "MMapFactory.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Opcodes.h" #include "OutdoorPvPMgr.h" @@ -68,7 +68,7 @@ #include "TransportMgr.h" #include "Util.h" #include "VMapFactory.h" -#include "VMapManager2.h" +#include "VMapMgr2.h" #include "Vehicle.h" #include "Warden.h" #include "WardenCheckMgr.h" @@ -1269,8 +1269,8 @@ void World::LoadConfigSettings(bool reload) if (!enableHeight) LOG_ERROR("server.loading", "VMap height checking disabled! Creatures movements and other various things WILL be broken! Expect no support."); - VMAP::VMapFactory::createOrGetVMapManager()->setEnableLineOfSightCalc(enableLOS); - VMAP::VMapFactory::createOrGetVMapManager()->setEnableHeightCalc(enableHeight); + VMAP::VMapFactory::createOrGetVMapMgr()->setEnableLineOfSightCalc(enableLOS); + VMAP::VMapFactory::createOrGetVMapMgr()->setEnableHeightCalc(enableHeight); LOG_INFO("server.loading", "WORLD: VMap support included. LineOfSight:%i, getHeight:%i, indoorCheck:%i PetLOS:%i", enableLOS, enableHeight, enableIndoor, enablePetLOS); m_bool_configs[CONFIG_PET_LOS] = sConfigMgr->GetOption("vmap.petLOS", true); @@ -1426,8 +1426,8 @@ void World::SetInitialWorldSettings() LOG_INFO("server.loading", "Initializing Scripts..."); sScriptMgr->Initialize(); - ///- Initialize VMapManager function pointers (to untangle game/collision circular deps) - VMAP::VMapManager2* vmmgr2 = VMAP::VMapFactory::createOrGetVMapManager(); + ///- Initialize VMapMgr function pointers (to untangle game/collision circular deps) + VMAP::VMapMgr2* vmmgr2 = VMAP::VMapFactory::createOrGetVMapMgr(); vmmgr2->GetLiquidFlagsPtr = &GetLiquidFlags; vmmgr2->IsVMAPDisabledForPtr = &DisableMgr::IsVMAPDisabledFor; @@ -1443,15 +1443,15 @@ void World::SetInitialWorldSettings() if (!sConfigMgr->isDryRun()) { ///- Check the existence of the map files for all starting areas. - if (!MapManager::ExistMapAndVMap(0, -6240.32f, 331.033f) - || !MapManager::ExistMapAndVMap(0, -8949.95f, -132.493f) - || !MapManager::ExistMapAndVMap(1, -618.518f, -4251.67f) - || !MapManager::ExistMapAndVMap(0, 1676.35f, 1677.45f) - || !MapManager::ExistMapAndVMap(1, 10311.3f, 832.463f) - || !MapManager::ExistMapAndVMap(1, -2917.58f, -257.98f) + if (!MapMgr::ExistMapAndVMap(0, -6240.32f, 331.033f) + || !MapMgr::ExistMapAndVMap(0, -8949.95f, -132.493f) + || !MapMgr::ExistMapAndVMap(1, -618.518f, -4251.67f) + || !MapMgr::ExistMapAndVMap(0, 1676.35f, 1677.45f) + || !MapMgr::ExistMapAndVMap(1, 10311.3f, 832.463f) + || !MapMgr::ExistMapAndVMap(1, -2917.58f, -257.98f) || (m_int_configs[CONFIG_EXPANSION] && ( - !MapManager::ExistMapAndVMap(530, 10349.6f, -6357.29f) || - !MapManager::ExistMapAndVMap(530, -3961.64f, -13931.2f)))) + !MapMgr::ExistMapAndVMap(530, 10349.6f, -6357.29f) || + !MapMgr::ExistMapAndVMap(530, -3961.64f, -13931.2f)))) { exit(1); } @@ -1502,7 +1502,7 @@ void World::SetInitialWorldSettings() vmmgr2->InitializeThreadUnsafe(mapIds); - MMAP::MMapManager* mmmgr = MMAP::MMapFactory::createOrGetMMapManager(); + MMAP::MMapMgr* mmmgr = MMAP::MMapFactory::createOrGetMMapMgr(); mmmgr->InitializeThreadUnsafe(mapIds); LOG_INFO("server.loading", "Loading Game Graveyard..."); @@ -1960,7 +1960,7 @@ void World::SetInitialWorldSettings() ///- Initilize static helper structures AIRegistry::Initialize(); - ///- Initialize MapManager + ///- Initialize MapMgr LOG_INFO("server.loading", "Starting Map System"); LOG_INFO("server.loading", " "); sMapMgr->Initialize(); diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index dae95cd3b..027638a6a 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -12,7 +12,7 @@ Category: commandscripts EndScriptData */ #include "AccountMgr.h" -#include "BanManager.h" +#include "BanMgr.h" #include "Chat.h" #include "Language.h" #include "ObjectAccessor.h" diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 18f225fa3..450c6a083 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -830,7 +830,7 @@ public: if (!target || target->IsTotem() || target->IsPet()) return false; - ThreatContainer::StorageType const& threatList = target->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& threatList = target->getThreatMgr().getThreatList(); ThreatContainer::StorageType::const_iterator itr; uint32 count = 0; handler->PSendSysMessage("Threat list of %s (%s)", target->GetName().c_str(), target->GetGUID().ToString().c_str()); @@ -844,7 +844,7 @@ public: } handler->PSendSysMessage(" %u. %s (%s) - threat %f", ++count, unit->GetName().c_str(), unit->GetGUID().ToString().c_str(), (*itr)->getThreat()); } - ThreatContainer::StorageType const& threatList2 = target->getThreatManager().getOfflineThreatList(); + ThreatContainer::StorageType const& threatList2 = target->getThreatMgr().getOfflineThreatList(); for (itr = threatList2.begin(); itr != threatList2.end(); ++itr) { Unit* unit = (*itr)->getTarget(); @@ -865,7 +865,7 @@ public: Unit* target = handler->getSelectedUnit(); if (!target) target = handler->GetSession()->GetPlayer(); - HostileReference* ref = target->getHostileRefManager().getFirst(); + HostileReference* ref = target->getHostileRefMgr().getFirst(); uint32 count = 0; handler->PSendSysMessage("Hostil reference list of %s (%s)", target->GetName().c_str(), target->GetGUID().ToString().c_str()); while (ref) diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 026e2265f..914809428 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -14,7 +14,7 @@ EndScriptData */ #include "Chat.h" #include "GameGraveyard.h" #include "Language.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Player.h" #include "ScriptMgr.h" @@ -135,7 +135,7 @@ public: ort = creature->GetOrientation(); } - if (!MapManager::IsValidMapCoord(mapId, x, y, z, ort)) + if (!MapMgr::IsValidMapCoord(mapId, x, y, z, ort)) { handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId); handler->SetSentErrorMessage(true); @@ -180,7 +180,7 @@ public: return false; } - if (!MapManager::IsValidMapCoord(gy->Map, gy->x, gy->y, gy->z)) + if (!MapMgr::IsValidMapCoord(gy->Map, gy->x, gy->y, gy->z)) { handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, gy->x, gy->y, gy->Map); handler->SetSentErrorMessage(true); @@ -222,7 +222,7 @@ public: float x = ((float)atof(gridX) - CENTER_GRID_ID + 0.5f) * SIZE_OF_GRIDS; float y = ((float)atof(gridY) - CENTER_GRID_ID + 0.5f) * SIZE_OF_GRIDS; - if (!MapManager::IsValidMapCoord(mapId, x, y)) + if (!MapMgr::IsValidMapCoord(mapId, x, y)) { handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId); handler->SetSentErrorMessage(true); @@ -282,7 +282,7 @@ public: return false; } - if (!MapManager::IsValidMapCoord(mapId, x, y, z, ort)) + if (!MapMgr::IsValidMapCoord(mapId, x, y, z, ort)) { handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId); handler->SetSentErrorMessage(true); @@ -327,7 +327,7 @@ public: } if ((node->x == 0.0f && node->y == 0.0f && node->z == 0.0f) || - !MapManager::IsValidMapCoord(node->map_id, node->x, node->y, node->z)) + !MapMgr::IsValidMapCoord(node->map_id, node->x, node->y, node->z)) { handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, node->x, node->y, node->map_id); handler->SetSentErrorMessage(true); @@ -372,7 +372,7 @@ public: return false; } - if (!MapManager::IsValidMapCoord(at->map, at->x, at->y, at->z)) + if (!MapMgr::IsValidMapCoord(at->map, at->x, at->y, at->z)) { handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, at->x, at->y, at->map); handler->SetSentErrorMessage(true); @@ -442,7 +442,7 @@ public: Zone2MapCoordinates(x, y, zoneEntry->ID); - if (!MapManager::IsValidMapCoord(zoneEntry->mapid, x, y)) + if (!MapMgr::IsValidMapCoord(zoneEntry->mapid, x, y)) { handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, zoneEntry->mapid); handler->SetSentErrorMessage(true); @@ -491,7 +491,7 @@ public: if (goZ) { z = (float)atof(goZ); - if (!MapManager::IsValidMapCoord(mapId, x, y, z)) + if (!MapMgr::IsValidMapCoord(mapId, x, y, z)) { handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId); handler->SetSentErrorMessage(true); @@ -500,7 +500,7 @@ public: } else { - if (!MapManager::IsValidMapCoord(mapId, x, y)) + if (!MapMgr::IsValidMapCoord(mapId, x, y)) { handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId); handler->SetSentErrorMessage(true); diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index e32a72eb9..e3b4213b6 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -15,7 +15,7 @@ EndScriptData */ #include "GameEventMgr.h" #include "GameObject.h" #include "Language.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Opcodes.h" #include "Player.h" @@ -466,7 +466,7 @@ public: float y = (float)atof(toY); float z = (float)atof(toZ); - if (!MapManager::IsValidMapCoord(object->GetMapId(), x, y, z)) + if (!MapMgr::IsValidMapCoord(object->GetMapId(), x, y, z)) { handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, object->GetMapId()); handler->SetSentErrorMessage(true); diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index 2ab6759f1..1d8eb372d 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -16,7 +16,7 @@ EndScriptData */ #include "InstanceSaveMgr.h" #include "InstanceScript.h" #include "Language.h" -#include "MapManager.h" +#include "MapMgr.h" #include "Player.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index b63c36b77..87e173242 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -18,7 +18,7 @@ #include "IPLocation.h" #include "Language.h" #include "LFG.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MovementGenerator.h" #include "ObjectAccessor.h" #include "Opcodes.h" @@ -2620,7 +2620,7 @@ public: return false; target->CombatStop(); - target->getHostileRefManager().deleteReferences(); + target->getHostileRefMgr().deleteReferences(); return true; } diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index 0673c72b2..8d0a037d5 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -49,7 +49,7 @@ public: static bool HandleMmapPathCommand(ChatHandler* handler, char const* args) { - if (!MMAP::MMapFactory::createOrGetMMapManager()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId())) + if (!MMAP::MMapFactory::createOrGetMMapMgr()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId())) { handler->PSendSysMessage("NavMesh not loaded for current map."); return true; @@ -124,8 +124,8 @@ public: handler->PSendSysMessage("gridloc [%i, %i]", gy, gx); // calculate navmesh tile location - dtNavMesh const* navmesh = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId()); - dtNavMeshQuery const* navmeshquery = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMeshQuery(handler->GetSession()->GetPlayer()->GetMapId(), player->GetInstanceId()); + dtNavMesh const* navmesh = MMAP::MMapFactory::createOrGetMMapMgr()->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId()); + dtNavMeshQuery const* navmeshquery = MMAP::MMapFactory::createOrGetMMapMgr()->GetNavMeshQuery(handler->GetSession()->GetPlayer()->GetMapId(), player->GetInstanceId()); if (!navmesh || !navmeshquery) { handler->PSendSysMessage("NavMesh not loaded for current map."); @@ -176,8 +176,8 @@ public: static bool HandleMmapLoadedTilesCommand(ChatHandler* handler, char const* /*args*/) { uint32 mapid = handler->GetSession()->GetPlayer()->GetMapId(); - dtNavMesh const* navmesh = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMesh(mapid); - dtNavMeshQuery const* navmeshquery = MMAP::MMapFactory::createOrGetMMapManager()->GetNavMeshQuery(mapid, handler->GetSession()->GetPlayer()->GetInstanceId()); + dtNavMesh const* navmesh = MMAP::MMapFactory::createOrGetMMapMgr()->GetNavMesh(mapid); + dtNavMeshQuery const* navmeshquery = MMAP::MMapFactory::createOrGetMMapMgr()->GetNavMeshQuery(mapid, handler->GetSession()->GetPlayer()->GetInstanceId()); if (!navmesh || !navmeshquery) { handler->PSendSysMessage("NavMesh not loaded for current map."); @@ -203,7 +203,7 @@ public: handler->PSendSysMessage("mmap stats:"); //handler->PSendSysMessage(" global mmap pathfinding is %sabled", DisableMgr::IsPathfindingEnabled(mapId) ? "en" : "dis"); - MMAP::MMapManager* manager = MMAP::MMapFactory::createOrGetMMapManager(); + MMAP::MMapMgr* manager = MMAP::MMapFactory::createOrGetMMapMgr(); handler->PSendSysMessage(" %u maps loaded with %u tiles overall", manager->getLoadedMapsCount(), manager->getLoadedTilesCount()); dtNavMesh const* navmesh = manager->GetNavMesh(handler->GetSession()->GetPlayer()->GetMapId()); diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index e88ecb71f..582875a7d 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -20,7 +20,7 @@ EndScriptData */ #include "GameGraveyard.h" #include "Language.h" #include "LFGMgr.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "ScriptMgr.h" #include "SkillDiscovery.h" @@ -29,7 +29,7 @@ EndScriptData */ #include "SpellMgr.h" #include "TicketMgr.h" #include "WardenCheckMgr.h" -#include "WaypointManager.h" +#include "WaypointMgr.h" #include "StringConvert.h" #include "Tokenize.h" diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index e43dcf754..86cd4f9bc 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -23,7 +23,7 @@ EndScriptData */ #include "ServerMotd.h" #include "StringConvert.h" #include "VMapFactory.h" -#include "VMapManager2.h" +#include "VMapMgr2.h" #include #include #include @@ -126,8 +126,8 @@ public: handler->PSendSysMessage("%s", dbPortOutput.c_str()); bool vmapIndoorCheck = sWorld->getBoolConfig(CONFIG_VMAP_INDOOR_CHECK); - bool vmapLOSCheck = VMAP::VMapFactory::createOrGetVMapManager()->isLineOfSightCalcEnabled(); - bool vmapHeightCheck = VMAP::VMapFactory::createOrGetVMapManager()->isHeightCalcEnabled(); + bool vmapLOSCheck = VMAP::VMapFactory::createOrGetVMapMgr()->isLineOfSightCalcEnabled(); + bool vmapHeightCheck = VMAP::VMapFactory::createOrGetVMapMgr()->isHeightCalcEnabled(); bool mmapEnabled = sWorld->getBoolConfig(CONFIG_ENABLE_MMAPS); diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index b3c4750b7..ecd34e545 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -14,7 +14,7 @@ EndScriptData */ #include "Chat.h" #include "Group.h" #include "Language.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Player.h" #include "ScriptMgr.h" diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index 293a9eb9f..f024f851c 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -16,7 +16,7 @@ EndScriptData */ #include "ObjectMgr.h" #include "Player.h" #include "ScriptMgr.h" -#include "WaypointManager.h" +#include "WaypointMgr.h" class wp_commandscript : public CommandScript { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index f22145459..9fe781c88 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -201,7 +201,7 @@ public: } // aggro target if Red Beam if (j == RED_PORTAL && me->GetVictim() != target && target->GetTypeId() == TYPEID_PLAYER) - me->getThreatManager().addThreat(target, 100000.0f + DoGetThreat(me->GetVictim())); + me->getThreatMgr().addThreat(target, 100000.0f + DoGetThreat(me->GetVictim())); } } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 172b388ef..f4b15eb44 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -240,7 +240,7 @@ public: if (!info) return; - ThreatContainer::StorageType const& t_list = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& t_list = me->getThreatMgr().getThreatList(); std::vector targets; if (t_list.empty()) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 4979b61f7..62d12ffd6 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -149,7 +149,7 @@ public: void FlameWreathEffect() { std::vector targets; - ThreatContainer::StorageType const& t_list = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& t_list = me->getThreatMgr().getThreatList(); if (t_list.empty()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 752b34b55..0a8fcdd19 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -380,7 +380,7 @@ public: void HandleDummy(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - GetCaster()->getThreatManager().resetAllAggro(); + GetCaster()->getThreatMgr().resetAllAggro(); if (Unit* target = GetHitUnit()) GetCaster()->CastSpell(target, SPELL_BLINK, true); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index dc12bd671..01c9994e6 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -286,15 +286,15 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI void RecalculateThreat() { - ThreatContainer::StorageType const& tList = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& tList = me->getThreatMgr().getThreatList(); for( ThreatContainer::StorageType::const_iterator itr = tList.begin(); itr != tList.end(); ++itr ) { Unit* pUnit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()); - if( pUnit && pUnit->GetTypeId() == TYPEID_PLAYER && me->getThreatManager().getThreat(pUnit) ) + if( pUnit && pUnit->GetTypeId() == TYPEID_PLAYER && me->getThreatMgr().getThreat(pUnit) ) { float threatMod = GetThreatMod(me->GetDistance2d(pUnit), (float)pUnit->GetArmor(), pUnit->GetHealth(), pUnit->GetMaxHealth(), pUnit); - me->getThreatManager().modifyThreatPercent(pUnit, -100); - if (HostileReference* ref = me->getThreatManager().getOnlineContainer().getReferenceByTarget(pUnit)) + me->getThreatMgr().modifyThreatPercent(pUnit, -100); + if (HostileReference* ref = me->getThreatMgr().getOnlineContainer().getReferenceByTarget(pUnit)) ref->addThreat(10000000.0f * threatMod); } } @@ -728,7 +728,7 @@ public: case EVENT_SPELL_BLINK: { bool InMeleeRange = false; - ThreatContainer::StorageType const& t_list = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& t_list = me->getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr) if (Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid())) if (target->IsWithinMeleeRange(me)) diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index aa57cd176..9ffbc0d2b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -534,7 +534,7 @@ public: Unit* SelectUnitCasting() { - ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType threatlist = me->getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) { if (Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid())) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 2082b87a2..28065d721 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -315,7 +315,7 @@ public: return; // Now lets get archimode threat list - ThreatContainer::StorageType const& t_list = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& t_list = me->getThreatMgr().getThreatList(); if (t_list.empty()) return; @@ -425,7 +425,7 @@ public: if (victim && me->IsWithinMeleeRange(victim)) return false; - ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& threatlist = me->getThreatMgr().getThreatList(); if (threatlist.empty()) return false; diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index e4afd02e2..c62a7df23 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -131,7 +131,7 @@ public: { std::list targetList; { - const std::list& threatlist = me->getThreatManager().getThreatList(); + const std::list& threatlist = me->getThreatMgr().getThreatList(); for (std::list::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) if ((*itr)->getTarget()->GetTypeId() == TYPEID_PLAYER && (*itr)->getTarget()->getPowerType() == POWER_MANA) targetList.push_back((*itr)->getTarget()); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index a3eb5c163..f7345e10a 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -648,7 +648,7 @@ public: //Place all units in threat list on outside of stomach Stomach_Map.clear(); - for (std::list::const_iterator i = me->getThreatManager().getThreatList().begin(); i != me->getThreatManager().getThreatList().end(); ++i) + for (std::list::const_iterator i = me->getThreatMgr().getThreatList().begin(); i != me->getThreatMgr().getThreatList().end(); ++i) Stomach_Map[(*i)->getUnitGuid()] = false; //Outside stomach //Spawn 2 flesh tentacles diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index a7e73293a..f853dfac7 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -404,7 +404,7 @@ public: void CastSpellOnBug(Creature* target) override { target->setFaction(14); - target->AI()->AttackStart(me->getThreatManager().getHostilTarget()); + target->AI()->AttackStart(me->getThreatMgr().getHostilTarget()); target->AddAura(SPELL_MUTATE_BUG, target); target->SetFullHealth(); } diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 3f29bdd01..fa43bbb44 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -78,7 +78,7 @@ public: if (TeleportTimer <= diff) { Talk(SAY_TELEPORT); - ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType threatlist = me->getThreatMgr().getThreatList(); for (auto i = threatlist.begin(); i != threatlist.end(); ++i) { Unit* unit = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid()); diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index a206f23e7..82834276c 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -17,7 +17,7 @@ quest_a_pawn_on_the_eternal_pawn EndContentData */ #include "AccountMgr.h" -#include "BanManager.h" +#include "BanMgr.h" #include "Group.h" #include "Player.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index 2e96bbbfe..e707408dc 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -414,7 +414,7 @@ public: { //Count alive players uint8 count = 0; - std::list const t_list = me->getThreatManager().getThreatList(); + std::list const t_list = me->getThreatMgr().getThreatList(); if (!t_list.empty()) { for (HostileReference const* reference : t_list) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 0b430add7..79351645a 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -3,7 +3,7 @@ */ #include "GameObjectAI.h" -#include "MapManager.h" +#include "MapMgr.h" #include "Player.h" #include "ruby_sanctum.h" #include "ScriptedCreature.h" @@ -1145,7 +1145,7 @@ public: GetTarget()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); GetTarget()->ToCreature()->SetReactState(REACT_DEFENSIVE); GetTarget()->GetMotionMaster()->Clear(); - GetTarget()->getThreatManager().clearReferences(); + GetTarget()->getThreatMgr().clearReferences(); GetTarget()->RemoveAllAttackers(); GetTarget()->AttackStop(); } @@ -1155,7 +1155,7 @@ public: GetTarget()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); GetTarget()->ToCreature()->SetReactState(REACT_DEFENSIVE); GetTarget()->GetMotionMaster()->Clear(); - GetTarget()->getThreatManager().clearReferences(); + GetTarget()->getThreatMgr().clearReferences(); GetTarget()->RemoveAllAttackers(); GetTarget()->AttackStop(); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index c936626ae..5b9d817d4 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -142,7 +142,7 @@ public: me->setFaction(35); events.Reset(); Talk(TEXT_EADRIC_DEATH); - me->getThreatManager().clearReferences(); + me->getThreatMgr().clearReferences(); me->SetRegeneratingHealth(false); _EnterEvadeMode(); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -289,7 +289,7 @@ public: me->setFaction(35); events.Reset(); Talk(TEXT_PALETRESS_DEATH); - me->getThreatManager().clearReferences(); + me->getThreatMgr().clearReferences(); me->SetRegeneratingHealth(false); _EnterEvadeMode(); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 3533b7062..22107a14a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -146,7 +146,7 @@ public: void Reset() override { me->SetReactState(REACT_PASSIVE); - me->getHostileRefManager().setOnlineOfflineState(false); + me->getHostileRefMgr().setOnlineOfflineState(false); } void OnCharmed(bool apply) override @@ -283,7 +283,7 @@ public: uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0; if( Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd)) ) { - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); me->AddThreat(target, 10000.0f); AttackStart(target); me->CastSpell(target, SPELL_MINIONS_CHARGE, false); @@ -736,7 +736,7 @@ public: uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0; if( Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd)) ) { - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); me->AddThreat(target, 10000.0f); AttackStart(target); me->CastSpell(target, SPELL_MINIONS_CHARGE, false); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index c224ee846..8aa27cc35 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -89,16 +89,16 @@ struct boss_faction_championsAI : public ScriptedAI void RecalculateThreat() { - ThreatContainer::StorageType const& tList = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& tList = me->getThreatMgr().getThreatList(); for( ThreatContainer::StorageType::const_iterator itr = tList.begin(); itr != tList.end(); ++itr ) { Unit* pUnit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()); - if( pUnit && pUnit->GetTypeId() == TYPEID_PLAYER && me->getThreatManager().getThreat(pUnit) ) + if( pUnit && pUnit->GetTypeId() == TYPEID_PLAYER && me->getThreatMgr().getThreat(pUnit) ) { float threatMod = GetThreatMod(me->GetDistance2d(pUnit), (float)pUnit->GetArmor(), pUnit->GetHealth(), pUnit->GetMaxHealth(), pUnit); - me->getThreatManager().modifyThreatPercent(pUnit, -100); - //me->getThreatManager().doAddThreat(pUnit, 10000000.0f * threatMod); - if (HostileReference* ref = me->getThreatManager().getOnlineContainer().getReferenceByTarget(pUnit)) + me->getThreatMgr().modifyThreatPercent(pUnit, -100); + //me->getThreatMgr().doAddThreat(pUnit, 10000000.0f * threatMod); + if (HostileReference* ref = me->getThreatMgr().getOnlineContainer().getReferenceByTarget(pUnit)) ref->addThreat(10000000.0f * threatMod); } } @@ -164,7 +164,7 @@ struct boss_faction_championsAI : public ScriptedAI uint32 EnemiesInRange(float distance) { - ThreatContainer::StorageType const& tList = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& tList = me->getThreatMgr().getThreatList(); uint32 count = 0; Unit* target; for( ThreatContainer::StorageType::const_iterator iter = tList.begin(); iter != tList.end(); ++iter ) @@ -178,7 +178,7 @@ struct boss_faction_championsAI : public ScriptedAI Unit* SelectEnemyCaster(bool casting, float range) { - ThreatContainer::StorageType const& tList = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& tList = me->getThreatMgr().getThreatList(); Unit* target; for( ThreatContainer::StorageType::const_iterator iter = tList.begin(); iter != tList.end(); ++iter ) { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 2534a3cbe..fa98fc22a 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -148,7 +148,7 @@ public: if (me->HealthBelowPct(50)) { Talk(SAY_FLESH); - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); me->CastSpell((Unit*)nullptr, SPELL_TURN_FLESH, false); events.Reset(); @@ -244,7 +244,7 @@ public: void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { PreventDefaultAction(); - GetUnitOwner()->getThreatManager().resetAllAggro(); + GetUnitOwner()->getThreatMgr().resetAllAggro(); GetUnitOwner()->GetMotionMaster()->Clear(); GetUnitOwner()->CastSpell((Unit*)nullptr, SPELL_TURN_BONES, false); GetUnitOwner()->GetAI()->DoAction(ACTION_TURN_BONES); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 6df3158a8..aae69a516 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -3,7 +3,7 @@ */ #include "halls_of_reflection.h" -#include "MapManager.h" +#include "MapMgr.h" #include "Transport.h" class UtherBatteredHiltEvent : public BasicEvent diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index f7d091f4e..8a86f96e3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -3,7 +3,7 @@ */ #include "CreatureGroups.h" -#include "MapManager.h" +#include "MapMgr.h" #include "PassiveAI.h" #include "pit_of_saron.h" #include "Player.h" diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 1d793a537..f7d846b32 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -112,7 +112,7 @@ public: case EVENT_ECK_SPRING: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 30.0f, true)) { - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); me->AddThreat(target, 500.0f); me->CastSpell(target, SPELL_ECK_SPRING, false); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 5767563b2..d53cb8425 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -322,7 +322,7 @@ public: if (Player* p = itr->GetSource()) if (p->IsAlive() && p != me->GetVictim() && p->GetGUID() != _offtankGUID && !p->IsGameMaster() && p->GetDistance(me) < 70.0f) { - float th = me->getThreatManager().getThreatWithoutTemp(p); + float th = me->getThreatMgr().getThreatWithoutTemp(p); if (!target || th > maxThreat) { target = p; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 135064bbf..4256758e0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -286,7 +286,7 @@ public: if (events.GetPhaseMask() & PHASE_ONE_MASK && damage >= me->GetPower(POWER_MANA)) { // reset threat - ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& threatlist = me->getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr) { Unit* unit = ObjectAccessor::GetUnit((*me), (*itr)->getUnitGuid()); @@ -917,7 +917,7 @@ public: ScriptedAI::AttackStart(who); if (!targetGUID) { - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); me->AddThreat(who, 1000000.0f); targetGUID = who->GetGUID(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 7600537e2..d64b5b0ee 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -3,7 +3,7 @@ */ #include "icecrown_citadel.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "PassiveAI.h" #include "Player.h" diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 76a669fac..ec207736c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -485,7 +485,7 @@ public: bool Execute(uint64 /*time*/, uint32 /*diff*/) override { _owner->SetReactState(REACT_AGGRESSIVE); - if (!_owner->getThreatManager().isThreatListEmpty()) + if (!_owner->getThreatMgr().isThreatListEmpty()) if (Unit* target = _owner->SelectVictim()) _owner->AI()->AttackStart(target); if (!_owner->GetVictim()) @@ -2366,7 +2366,7 @@ public: { me->SetControlled(false, UNIT_STATE_ROOT); - if (!me->getThreatManager().isThreatListEmpty()) + if (!me->getThreatMgr().isThreatListEmpty()) if (Unit* target = me->SelectVictim()) AttackStart(target); if (!me->GetVictim()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index f5b3fc063..65bc9b2eb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -572,7 +572,7 @@ public: { checkTimer = 3000; me->SetInCombatWithZone(); - ThreatContainer::StorageType const& threatList = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& threatList = me->getThreatMgr().getThreatList(); if (!threatList.empty()) for (ThreatContainer::StorageType::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr) if (Unit* target = (*itr)->getTarget()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 77c7b87ca..29e8bcbdc 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1761,15 +1761,15 @@ public: me->GetPosition(&myPos); me->NearTeleportTo(c->GetPositionX(), c->GetPositionY(), c->GetPositionZ(), c->GetOrientation()); c->NearTeleportTo(myPos.GetPositionX(), myPos.GetPositionY(), myPos.GetPositionZ(), myPos.GetOrientation()); - const ThreatContainer::StorageType me_tl = me->getThreatManager().getThreatList(); - const ThreatContainer::StorageType target_tl = c->getThreatManager().getThreatList(); + const ThreatContainer::StorageType me_tl = me->getThreatMgr().getThreatList(); + const ThreatContainer::StorageType target_tl = c->getThreatMgr().getThreatList(); DoResetThreat(); for (ThreatContainer::StorageType::const_iterator iter = target_tl.begin(); iter != target_tl.end(); ++iter) - me->getThreatManager().addThreat((*iter)->getTarget(), (*iter)->getThreat()); + me->getThreatMgr().addThreat((*iter)->getTarget(), (*iter)->getThreat()); - c->getThreatManager().resetAllAggro(); + c->getThreatMgr().resetAllAggro(); for (ThreatContainer::StorageType::const_iterator iter = me_tl.begin(); iter != me_tl.end(); ++iter) - c->getThreatManager().addThreat((*iter)->getTarget(), (*iter)->getThreat()); + c->getThreatMgr().addThreat((*iter)->getTarget(), (*iter)->getThreat()); } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 87d0c4a80..8d448c39b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -436,10 +436,10 @@ public: { me->CastSpell(me, SPELL_TELEPORT_LIVE, false); } - me->getThreatManager().resetAggro(NotOnSameSide(me)); + me->getThreatMgr().resetAggro(NotOnSameSide(me)); if (Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0)) { - me->getThreatManager().addThreat(pTarget, 100.0f); + me->getThreatMgr().addThreat(pTarget, 100.0f); AttackStart(pTarget); } events.RepeatEvent(20000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index d2a6d9165..5d2136c18 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -425,7 +425,7 @@ public: case EVENT_DETONATE_MANA: { std::vector unitList; - ThreatContainer::StorageType const& threatList = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& threatList = me->getThreatMgr().getThreatList(); for (auto itr : threatList) { if (itr->getTarget()->GetTypeId() == TYPEID_PLAYER diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 0b4b924aa..f0b36da00 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -115,8 +115,8 @@ public: std::list meleeRangeTargets; Unit* finalTarget = nullptr; uint8 counter = 0; - auto i = me->getThreatManager().getThreatList().begin(); - for (; i != me->getThreatManager().getThreatList().end(); ++i, ++counter) + auto i = me->getThreatMgr().getThreatList().begin(); + for (; i != me->getThreatMgr().getThreatList().end(); ++i, ++counter) { // Gather all units with melee range Unit* target = (*i)->getTarget(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index baab6dd29..0dfd3487f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -308,8 +308,8 @@ public: } std::vector targets; - auto i = me->getThreatManager().getThreatList().begin(); - for (; i != me->getThreatManager().getThreatList().end(); ++i) + auto i = me->getThreatMgr().getThreatList().begin(); + for (; i != me->getThreatMgr().getThreatList().end(); ++i) { if ((*i)->getTarget()->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index f1b58adbc..e49417a22 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -541,17 +541,17 @@ public: if (!feugen->IsAlive() || !feugen->GetVictim() || !me->GetVictim()) return; - float threatFeugen = feugen->getThreatManager().getThreat(feugen->GetVictim()); - float threatStalagg = me->getThreatManager().getThreat(me->GetVictim()); + float threatFeugen = feugen->getThreatMgr().getThreat(feugen->GetVictim()); + float threatStalagg = me->getThreatMgr().getThreat(me->GetVictim()); Unit* tankFeugen = feugen->GetVictim(); Unit* tankStalagg = me->GetVictim(); - feugen->getThreatManager().modifyThreatPercent(tankFeugen, -100); + feugen->getThreatMgr().modifyThreatPercent(tankFeugen, -100); feugen->AddThreat(tankStalagg, threatFeugen); feugen->CastSpell(tankStalagg, SPELL_MAGNETIC_PULL, true); feugen->AI()->DoAction(ACTION_MAGNETIC_PULL); - me->getThreatManager().modifyThreatPercent(tankStalagg, -100); + me->getThreatMgr().modifyThreatPercent(tankStalagg, -100); me->AddThreat(tankFeugen, threatStalagg); me->CastSpell(tankFeugen, SPELL_MAGNETIC_PULL, true); DoAction(ACTION_MAGNETIC_PULL); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 2c7c640f8..ee6f87898 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -3,7 +3,7 @@ */ #include "GameObjectAI.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MoveSplineInit.h" #include "ObjectMgr.h" #include "PassiveAI.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 9e547d478..58dccade7 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -1655,7 +1655,7 @@ public: if (!target || !caster) return; - caster->getThreatManager().resetAllAggro(); + caster->getThreatMgr().resetAllAggro(); caster->GetAI()->AttackStart(target); // Chase target caster->AddThreat(target, 10000000.0f); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 72add78fd..716f97362 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -3,7 +3,7 @@ */ #include "AccountMgr.h" -#include "BanManager.h" +#include "BanMgr.h" #include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 622315b72..b622b4441 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -133,7 +133,7 @@ public: heat->ModStackAmount(-1); } me->CastSpell(me, SPELL_MOLTEN, true); - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); } } } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index c9417ea1e..7493beaaa 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -642,7 +642,7 @@ public: bool operator() (WorldObject* target) const { - if (target == _victim && _me->getThreatManager().getThreatList().size() > 1) + if (target == _victim && _me->getThreatMgr().getThreatList().size() > 1) return true; if (target->GetTypeId() != TYPEID_PLAYER) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 6a5fa537c..54302f1fd 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -2,7 +2,7 @@ * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 */ -#include "MapManager.h" +#include "MapMgr.h" #include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 016a596fd..2676bb685 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -10,7 +10,7 @@ #include "SpellAuras.h" #include "SpellScript.h" #include "ulduar.h" -#include "WaypointManager.h" +#include "WaypointMgr.h" #define SPELL_FLAMEBUFFET_10 64016 #define SPELL_FLAMEBUFFET_25 64023 diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index e30536959..52fe49b0d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -1142,7 +1142,7 @@ public: } } _playerAttack = true; - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); me->CallForHelp(40.0f); AttackStart(who); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 4f6e46566..4724d80f6 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -178,7 +178,7 @@ public: if (switchTimer >= 10000) { switchTimer = 0; - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); if (Player* player = SelectTargetFromPlayerList(100.0f)) me->AddThreat(player, 100000.0f); } diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index c6393be62..161be6dd7 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -27,7 +27,7 @@ EndContentData */ #include "SpellAuras.h" #include "SpellScript.h" #include "Vehicle.h" -#include "WaypointManager.h" +#include "WaypointMgr.h" // Ours enum songOfWindandWater { diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 5b8d74a29..afe9790e1 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -13,7 +13,7 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" #include "Vehicle.h" -#include "WaypointManager.h" +#include "WaypointMgr.h" #include "WorldSession.h" // Ours diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 9fddf418f..a91ce1d42 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -7,7 +7,7 @@ #include "GameGraveyard.h" #include "GameObject.h" #include "Language.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "OutdoorPvPEP.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp index 9e2133453..99dc1b057 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPGH.cpp @@ -5,7 +5,7 @@ */ #include "GameEventMgr.h" -#include "MapManager.h" +#include "MapMgr.h" #include "OutdoorPvPGH.h" #include "OutdoorPvPMgr.h" #include "Player.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index 4973c51f9..79f0bde32 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -5,7 +5,7 @@ */ #include "Language.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "OutdoorPvP.h" #include "OutdoorPvPHP.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 43774e3da..e4a91e114 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -5,7 +5,7 @@ */ #include "GameGraveyard.h" -#include "MapManager.h" +#include "MapMgr.h" #include "Language.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index a6fb58b7e..ae7d3a0ca 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -6,7 +6,7 @@ #include "GameObject.h" #include "Language.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" #include "OutdoorPvPSI.h" diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index a0c85d8b7..522f0347c 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -5,7 +5,7 @@ */ #include "Language.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "OutdoorPvP.h" #include "OutdoorPvPMgr.h" diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 66a774c64..ddb733237 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -103,7 +103,7 @@ public: { me->CastSpell(me, SPELL_INCITE_CHAOS, false); - std::list t_list = me->getThreatManager().getThreatList(); + std::list t_list = me->getThreatMgr().getThreatList(); for (std::list::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr) { Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 96ea055db..4385b4f08 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -137,7 +137,7 @@ public: if (!me->IsWithinMeleeRange(me->GetVictim())) { - ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType threatlist = me->getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i) if (Unit* target = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid())) if (target->IsAlive() && me->IsWithinMeleeRange(target)) diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index 14f200bc4..b1e2736ce 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -233,7 +233,7 @@ public: { PreventHitEffect(effIndex); if (Unit* target = GetHitUnit()) - GetCaster()->getThreatManager().modifyThreatPercent(target, -20); + GetCaster()->getThreatMgr().modifyThreatPercent(target, -20); } void Register() override diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 5495e0d71..3ca2ecd65 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -608,7 +608,7 @@ public: me->SetDisableGravity(false); break; case EVENT_START_PHASE_3_LAND: - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetTarget(me->GetVictim()->GetGUID()); AttackStart(me->GetVictim()); @@ -621,7 +621,7 @@ public: // /////////////////////////// case EVENT_PHASE_4_START: me->CastSpell(me, SPELL_DEMON_TRANSFORM_1, true); - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); me->GetMotionMaster()->MoveChase(me->GetVictim(), 35.0f); events.Reset(); events.ScheduleEvent(EVENT_SPELL_SHADOW_BLAST, 11000); @@ -644,7 +644,7 @@ public: break; case EVENT_REMOVE_DEMON_FORM: me->CastSpell(me, SPELL_DEMON_TRANSFORM_1, true); - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); events.Reset(); if (summons.HasEntry(NPC_MAIEV_SHADOWSONG)) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 14e77f851..d303be102 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -113,7 +113,7 @@ public: Unit* FindHatefulStrikeTarget() { Unit* target = nullptr; - ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& threatlist = me->getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i) { Unit* unit = ObjectAccessor::GetUnit(*me, (*i)->getUnitGuid()); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 4a336ce34..1ac2b1fb2 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -342,7 +342,7 @@ public: void HandleScriptEffect(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - GetCaster()->getThreatManager().resetAllAggro(); + GetCaster()->getThreatMgr().resetAllAggro(); if (roll_chance_i(33)) if (Unit* target = GetCaster()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index f8bfd8a49..31dc3a1a8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -174,7 +174,7 @@ public: target = me->GetVictim(); else { - ThreatContainer::StorageType const& t_list = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& t_list = me->getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = t_list.begin(); itr != t_list.end(); ++itr) if (Unit* threatTarget = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid())) if (me->IsWithinMeleeRange(threatTarget)) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 866fec801..7881960d9 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -208,7 +208,7 @@ public: // Xinef: if we have target we currently follow, return if (Unit* target = GetCaster()->GetVictim()) - if (GetCaster()->getThreatManager().getThreat(target) >= 100000.0f) + if (GetCaster()->getThreatMgr().getThreat(target) >= 100000.0f) return; // Xinef: acquire new target diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index bf807693b..996313186 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -6,7 +6,7 @@ #include "ScriptedCreature.h" #include "ScriptMgr.h" #include "the_eye.h" -#include "WaypointManager.h" +#include "WaypointMgr.h" enum Spells { @@ -310,7 +310,7 @@ public: else { me->resetAttackTimer(); - ThreatContainer::StorageType const& threatList = me->getThreatManager().getThreatList(); + ThreatContainer::StorageType const& threatList = me->getThreatMgr().getThreatList(); for (ThreatContainer::StorageType::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr) if (Unit* unit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid())) if (me->IsWithinMeleeRange(unit)) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 82beb381a..7ab2447fd 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -984,7 +984,7 @@ public: { PreventHitEffect(effIndex); - ThreatContainer::StorageType const& ThreatList = GetCaster()-> getThreatManager().getThreatList(); + ThreatContainer::StorageType const& ThreatList = GetCaster()-> getThreatMgr().getThreatList(); std::list targetList; for (ThreatContainer::StorageType::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) { diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 3bb1e391b..fcafda066 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -1742,7 +1742,7 @@ public: // some code to cast spell Mana Burn on random target which has mana if (ManaBurnTimer <= diff) { - std::list AggroList = me->getThreatManager().getThreatList(); + std::list AggroList = me->getThreatMgr().getThreatList(); std::list UnitsWithMana; for (std::list::const_iterator itr = AggroList.begin(); itr != AggroList.end(); ++itr) diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 1b7b52fa5..dc227ee50 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -482,7 +482,7 @@ public: AttackStart(Dragonmaw); } - HostileReference* ref = me->getThreatManager().getOnlineContainer().getReferenceByTarget(caster); + HostileReference* ref = me->getThreatMgr().getOnlineContainer().getReferenceByTarget(caster); if (ref) ref->removeReference(); } diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp index 0edb6ff0b..7af6d6789 100644 --- a/src/server/scripts/Pet/pet_mage.cpp +++ b/src/server/scripts/Pet/pet_mage.cpp @@ -91,7 +91,7 @@ public: // Xinef: Inherit Master's Threat List (not yet implemented) //owner->CastSpell((Unit*)nullptr, SPELL_MAGE_MASTERS_THREAT_LIST, true); - HostileReference* ref = owner->getHostileRefManager().getFirst(); + HostileReference* ref = owner->getHostileRefMgr().getFirst(); while (ref) { if (Unit* unit = ref->GetSource()->GetOwner()) @@ -158,7 +158,7 @@ public: if (selection) { - me->getThreatManager().resetAllAggro(); + me->getThreatMgr().resetAllAggro(); me->AddThreat(selection, 1000000.0f); if (owner->IsInCombat()) diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index a0cae31f1..1a2bd04e3 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1249,7 +1249,7 @@ public: PreventHitDefaultEffect(effIndex); if (Unit* target = GetHitUnit()) if (Creature* caster = GetCaster()->ToCreature()) - caster->getThreatManager().modifyThreatPercent(target, -25); // Xinef: amount confirmed by onyxia and void reaver notes + caster->getThreatMgr().modifyThreatPercent(target, -25); // Xinef: amount confirmed by onyxia and void reaver notes } void Register() override @@ -1410,7 +1410,7 @@ public: PreventHitDefaultEffect(effIndex); if (Unit* target = GetHitUnit()) if (Creature* caster = GetCaster()->ToCreature()) - caster->getThreatManager().modifyThreatPercent(target, -100); + caster->getThreatMgr().modifyThreatPercent(target, -100); } void Register() override @@ -5437,7 +5437,7 @@ public: if (instant_exit) { - caster->getHostileRefManager().deleteReferences(); + caster->getHostileRefMgr().deleteReferences(); } caster->CombatStop(); } diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 76894fe1e..e441e5bb8 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -13,7 +13,7 @@ #include "CellImpl.h" #include "CreatureTextMgr.h" #include "GridNotifiers.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ScriptedCreature.h" #include "ScriptMgr.h" #include "SpellAuraEffects.h" diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index e8d115002..53c4e355a 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -857,7 +857,7 @@ public: Unit* caster = GetCaster(); if (Unit* target = GetHitUnit()) { - if (target->CanHaveThreatList() && target->getThreatManager().getThreat(caster) > 0.0f) + if (target->CanHaveThreatList() && target->getThreatMgr().getThreat(caster) > 0.0f) caster->CastSpell(target, SPELL_WARLOCK_SOULSHATTER, true); } } diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 2effd8403..c3bfe03e8 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -44,7 +44,7 @@ EndContentData */ #include "ScriptMgr.h" #include "SmartAI.h" #include "SpellAuras.h" -#include "WaypointManager.h" +#include "WaypointMgr.h" #include "World.h" enum elderClearwater diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index e5503a370..61ecb9223 100644 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -15,7 +15,7 @@ #include "Config.h" #include "Language.h" #include "Log.h" -#include "MapManager.h" +#include "MapMgr.h" #include "ObjectMgr.h" #include "Player.h" #include "Util.h" diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 3ffd40486..92d5dea46 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -25,7 +25,7 @@ #include "DeadlineTimer.h" #include "GitRevision.h" #include "IoContext.h" -#include "MapManager.h" +#include "MapMgr.h" #include "MySQLThreading.h" #include "ObjectAccessor.h" #include "OpenSSLCrypto.h" @@ -296,7 +296,7 @@ int main(int argc, char** argv) // unload battleground templates before different singletons destroyed sBattlegroundMgr->DeleteAllBattlegrounds(); - sOutdoorPvPMgr->Die(); // unload it before MapManager + sOutdoorPvPMgr->Die(); // unload it before MapMgr sMapMgr->UnloadAll(); // unload all grids (including locked in memory) #ifdef ELUNA diff --git a/src/tools/mesh_extractor/ChunkedData.cpp b/src/tools/mesh_extractor/ChunkedData.cpp index 0f186013c..8231cd4eb 100644 --- a/src/tools/mesh_extractor/ChunkedData.cpp +++ b/src/tools/mesh_extractor/ChunkedData.cpp @@ -5,7 +5,7 @@ */ #include "ChunkedData.h" -#include "MPQManager.h" +#include "MPQMgr.h" #include "Utils.h" #include diff --git a/src/tools/mesh_extractor/MPQ.cpp b/src/tools/mesh_extractor/MPQ.cpp index 3b002bcb4..23a765b2a 100644 --- a/src/tools/mesh_extractor/MPQ.cpp +++ b/src/tools/mesh_extractor/MPQ.cpp @@ -5,7 +5,7 @@ */ #include "MPQ.h" -#include "MPQManager.h" +#include "MPQMgr.h" #include #include diff --git a/src/tools/mesh_extractor/MPQManager.cpp b/src/tools/mesh_extractor/MPQMgr.cpp similarity index 87% rename from src/tools/mesh_extractor/MPQManager.cpp rename to src/tools/mesh_extractor/MPQMgr.cpp index 7d7ffffe8..d8e790d85 100644 --- a/src/tools/mesh_extractor/MPQManager.cpp +++ b/src/tools/mesh_extractor/MPQMgr.cpp @@ -4,12 +4,12 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "MPQManager.h" +#include "MPQMgr.h" #include "MPQ.h" #include "DBC.h" #include "Utils.h" -char const* MPQManager::Files[] = +char const* MPQMgr::Files[] = { "common.MPQ", "common-2.MPQ", @@ -20,9 +20,9 @@ char const* MPQManager::Files[] = "patch-3.MPQ" }; -char const* MPQManager::Languages[] = { "enGB", "enUS", "deDE", "esES", "frFR", "koKR", "zhCN", "zhTW", "enCN", "enTW", "esMX", "ruRU" }; +char const* MPQMgr::Languages[] = { "enGB", "enUS", "deDE", "esES", "frFR", "koKR", "zhCN", "zhTW", "enCN", "enTW", "esMX", "ruRU" }; -void MPQManager::Initialize() +void MPQMgr::Initialize() { InitializeDBC(); uint32 size = sizeof(Files) / sizeof(char*); @@ -34,7 +34,7 @@ void MPQManager::Initialize() } } -void MPQManager::InitializeDBC() +void MPQMgr::InitializeDBC() { BaseLocale = -1; std::string fileName; @@ -70,7 +70,7 @@ void MPQManager::InitializeDBC() printf("Using default locale: %s\n", Languages[BaseLocale]); } -FILE* MPQManager::GetFile(const std::string& path ) +FILE* MPQMgr::GetFile(const std::string& path ) { GUARD_RETURN(mutex, nullptr); MPQFile file(path.c_str()); @@ -79,13 +79,13 @@ FILE* MPQManager::GetFile(const std::string& path ) return file.GetFileStream(); } -DBC* MPQManager::GetDBC(const std::string& name ) +DBC* MPQMgr::GetDBC(const std::string& name ) { std::string path = "DBFilesClient\\" + name + ".dbc"; return new DBC(GetFile(path)); } -FILE* MPQManager::GetFileFrom(const std::string& path, MPQArchive* file ) +FILE* MPQMgr::GetFileFrom(const std::string& path, MPQArchive* file ) { GUARD_RETURN(mutex, nullptr); mpq_archive* mpq_a = file->mpq_a; diff --git a/src/tools/mesh_extractor/MPQManager.h b/src/tools/mesh_extractor/MPQMgr.h similarity index 90% rename from src/tools/mesh_extractor/MPQManager.h rename to src/tools/mesh_extractor/MPQMgr.h index 777ff4fb4..04389546e 100644 --- a/src/tools/mesh_extractor/MPQManager.h +++ b/src/tools/mesh_extractor/MPQMgr.h @@ -14,11 +14,11 @@ #include class DBC; -class MPQManager +class MPQMgr { public: - MPQManager() {} - ~MPQManager() {} + MPQMgr() {} + ~MPQMgr() {} void Initialize(); FILE* GetFile(const std::string& path); @@ -39,5 +39,5 @@ private: std::mutex mutex; }; -extern MPQManager* MPQHandler; +extern MPQMgr* MPQHandler; #endif diff --git a/src/tools/mesh_extractor/MeshExtractor.cpp b/src/tools/mesh_extractor/MeshExtractor.cpp index 39d06969a..54d19e8b6 100644 --- a/src/tools/mesh_extractor/MeshExtractor.cpp +++ b/src/tools/mesh_extractor/MeshExtractor.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "MPQManager.h" +#include "MPQMgr.h" #include "WDT.h" #include "ContinentBuilder.h" #include "Cache.h" @@ -20,7 +20,7 @@ #include -MPQManager* MPQHandler; +MPQMgr* MPQHandler; CacheClass* Cache; void ExtractMMaps(std::set& mapIds, uint32 threads) @@ -72,15 +72,15 @@ void ExtractDBCs() // Iterate over all available locales for (std::set::iterator itr = MPQHandler->AvailableLocales.begin(); itr != MPQHandler->AvailableLocales.end(); ++itr) { - printf("Extracting DBCs for locale %s\n", MPQManager::Languages[*itr]); + printf("Extracting DBCs for locale %s\n", MPQMgr::Languages[*itr]); std::string path = baseDBCPath; if (*itr != uint32(MPQHandler->BaseLocale)) { - path += std::string(MPQManager::Languages[*itr]) + "/"; + path += std::string(MPQMgr::Languages[*itr]) + "/"; Utils::CreateDir(path); } - std::string component = "component.wow-" + std::string(MPQManager::Languages[*itr]) + ".txt"; + std::string component = "component.wow-" + std::string(MPQMgr::Languages[*itr]) + ".txt"; // Extract the component file Utils::SaveToDisk(MPQHandler->GetFileFrom(component, MPQHandler->LocaleFiles[*itr]), path + component); // Extract the DBC files for the given locale @@ -369,7 +369,7 @@ int main(int argc, char* argv[]) } Cache = new CacheClass(); - MPQHandler = new MPQManager(); + MPQHandler = new MPQMgr(); MPQHandler->Initialize(); if (extractFlags & Constants::EXTRACT_FLAG_DBC) diff --git a/src/tools/mesh_extractor/Model.cpp b/src/tools/mesh_extractor/Model.cpp index 45ec05983..404a3e1da 100644 --- a/src/tools/mesh_extractor/Model.cpp +++ b/src/tools/mesh_extractor/Model.cpp @@ -5,7 +5,7 @@ */ #include "Model.h" -#include "MPQManager.h" +#include "MPQMgr.h" #include "Utils.h" Model::Model( std::string path ) : IsCollidable(false), IsBad(false) diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index df3b89080..a7fedeba7 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -8,7 +8,7 @@ #include "PathCommon.h" #include "MapBuilder.h" #include "MapDefines.h" -#include "VMapManager2.h" +#include "VMapMgr2.h" #include "MapTree.h" #include "ModelInstance.h" #include @@ -636,8 +636,8 @@ namespace MMAP /**************************************************************************/ bool TerrainBuilder::loadVMap(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData) { - IVMapManager* vmapManager = new VMapManager2(); - int result = vmapManager->loadMap("vmaps", mapID, tileX, tileY); + IVMapMgr* vmapMgr = new VMapMgr2(); + int result = vmapMgr->loadMap("vmaps", mapID, tileX, tileY); bool retval = false; do @@ -646,7 +646,7 @@ namespace MMAP break; InstanceTreeMap instanceTrees; - ((VMapManager2*)vmapManager)->GetInstanceMapTree(instanceTrees); + ((VMapMgr2*)vmapMgr)->GetInstanceMapTree(instanceTrees); if (!instanceTrees[mapID]) break; @@ -790,8 +790,8 @@ namespace MMAP } } while (false); - vmapManager->unloadMap(mapID, tileX, tileY); - delete vmapManager; + vmapMgr->unloadMap(mapID, tileX, tileY); + delete vmapMgr; return retval; } diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h index 186be4ae6..35b9bece2 100644 --- a/src/tools/vmap4_extractor/wmo.h +++ b/src/tools/vmap4_extractor/wmo.h @@ -32,7 +32,7 @@ enum MopyFlags }; class WMOInstance; -class WMOManager; +class WMOMgr; class MPQFile; namespace ADT { struct MODF; }