sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Core): Rename ...Manager to ...Mgr (#6910)

Browse Source 
* Rename MapManager.h to MapMgr.h

* Rename BanManager.h to BanMgr.h

* Rename MapManager.cpp to MapMgr.cpp

* Rename BanManager.cpp to BanMgr.cpp

* Rename MapRefManager.h to MapRefMgr.h

* Rename ThreatManager.h to ThreatMgr.h

* Rename GridRefManager.h to GridRefMgr.h

* Rename ThreatManager.cpp to ThreatMgr.cpp

* Rename GroupRefManager.h to GroupRefMgr.h

* Rename HostileRefManager.h to HostileRefMgr.h

* Rename HostileRefManager.cpp to HostileRefMgr.cpp

* Rename MMapManager.h to MMapMgr.h

* Rename FollowerRefManager.h to FollowerRefMgr.h

* Rename VMapManager2.h to VMapMgr2.h

* Rename IVMapManager.h to IVMapMgr.h

* Rename MMapManager.cpp to MMapMgr.cpp

* Rename VMapManager2.cpp to VMapMgr2.cpp

* Rename RefManager.h to RefMgr.h

* Rename WaypointManager.h to WaypointMgr.h

* Rename WaypointManager.cpp to WaypointMgr.cpp

* Rename MPQManager.h to MPQMgr.h

* Rename MPQManager.cpp to MPQMgr.cpp

* Rename IMMAPManager.h to IMMAPMgr.h

* fix build

* Update Main.cpp

* chore(Core/Misc): Remove toxic language

* Revert "chore(Core/Misc): Remove toxic language"

* fix build

* build
This commit is contained in:
Kitzunu
2021-09-15 17:50:28 +02:00
committed by GitHub
parent 7e2aa2402f
commit 2f449326e0
187 changed files with 719 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/mesh_extractor/ChunkedData.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
*/
#include "ChunkedData.h"
#include "MPQManager.h"
#include "MPQMgr.h"
#include "Utils.h"
#include <string>
src/tools/mesh_extractor/MPQ.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
*/
#include "MPQ.h"
#include "MPQManager.h"
#include "MPQMgr.h"
#include <deque>
#include <cstdio>
src/tools/mesh_extractor/MPQManager.cpp → src/tools/mesh_extractor/MPQMgr.cpp
+8 -8
View File
@@ -4,12 +4,12 @@
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*/
#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;
src/tools/mesh_extractor/MPQManager.h → src/tools/mesh_extractor/MPQMgr.h
+4 -4
View File
@@ -14,11 +14,11 @@
#include <map>
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
src/tools/mesh_extractor/MeshExtractor.cpp
+6 -6
View File
@@ -4,7 +4,7 @@
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*/
#include "MPQManager.h"
#include "MPQMgr.h"
#include "WDT.h"
#include "ContinentBuilder.h"
#include "Cache.h"
@@ -20,7 +20,7 @@
#include <set>
MPQManager* MPQHandler;
MPQMgr* MPQHandler;
CacheClass* Cache;
void ExtractMMaps(std::set<uint32>& mapIds, uint32 threads)
@@ -72,15 +72,15 @@ void ExtractDBCs()
// Iterate over all available locales
for (std::set<uint32>::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)
src/tools/mesh_extractor/Model.cpp
+1 -1
View File
@@ -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)
src/tools/mmaps_generator/TerrainBuilder.cpp
+6 -6
View File
@@ -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 <vector>
@@ -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;
}
src/tools/vmap4_extractor/wmo.h
+1 -1
View File
@@ -32,7 +32,7 @@ enum MopyFlags
};
class WMOInstance;
class WMOManager;
class WMOMgr;
class MPQFile;
namespace ADT { struct MODF; }