nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-14 07:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/Tools): remove ACE from tools (#3351)

Browse Source
This commit is contained in:
Viste
2020-09-07 15:01:28 +03:00
committed by GitHub
parent 7694c99edb
commit 4dd9b92759
35 changed files with 465 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/vmap4_extractor/adtfile.cpp
View File

@@ -18,7 +18,7 @@ char const* GetPlainName(char const* FileName)
{
const char * szTemp;
if((szTemp = strrchr(FileName, '\\')) != NULL)
if((szTemp = strrchr(FileName, '\\')) != nullptr)
FileName = szTemp + 1;
return FileName;
}
@@ -27,7 +27,7 @@ char* GetPlainName(char* FileName)
{
char * szTemp;
if((szTemp = strrchr(FileName, '\\')) != NULL)
if((szTemp = strrchr(FileName, '\\')) != nullptr)
FileName = szTemp + 1;
return FileName;
}
@@ -59,10 +59,10 @@ char* GetExtension(char* FileName)
{
if (char* szTemp = strrchr(FileName, '.'))
return szTemp;
return NULL;
return nullptr;
}
ADTFile::ADTFile(char* filename): ADT(filename), nWMO(0), nMDX(0), WmoInstansName(NULL), ModelInstansName(NULL)
ADTFile::ADTFile(char* filename): ADT(filename), nWMO(0), nMDX(0), WmoInstansName(nullptr), ModelInstansName(nullptr)
{
Adtfilename.append(filename);
}

4
src/tools/vmap4_extractor/dbcfile.cpp
View File

@@ -12,7 +12,7 @@
#include <cstdio>
DBCFile::DBCFile(const std::string& filename):
filename(filename), recordSize(0), recordCount(0), fieldCount(0), stringSize(0), data(NULL), stringTable(NULL)
filename(filename), recordSize(0), recordCount(0), fieldCount(0), stringSize(0), data(nullptr), stringTable(nullptr)
{
}
@@ -34,7 +34,7 @@ bool DBCFile::open()
if (header[0]!='W' || header[1]!='D' || header[2]!='B' || header[3] != 'C')
{
f.close();
data = NULL;
data = nullptr;
printf("Critical Error: An error occured while trying to read the DBCFile %s.", filename.c_str());
return false;
}

4
src/tools/vmap4_extractor/model.h
View File

@@ -23,8 +23,8 @@ private:
{
delete[] vertices;
delete[] indices;
vertices = NULL;
indices = NULL;
vertices = nullptr;
indices = nullptr;
}
std::string filename;
public:

4
src/tools/vmap4_extractor/mpq_libmpq04.h
View File

@@ -42,13 +42,13 @@ public:
token = strtok( buffer, seps );
uint32 counter = 0;
while ((token != NULL) && (counter < size)) {
while ((token != nullptr) && (counter < size)) {
//cout << token << endl;
token[strlen(token) - 1] = 0;
string s = token;
filelist.push_back(s);
counter += strlen(token) + 2;
token = strtok(NULL, seps);
token = strtok(nullptr, seps);
}
delete[] buffer;

2
src/tools/vmap4_extractor/vmapexport.cpp
View File

@@ -148,7 +148,7 @@ bool ExtractSingleWmo(std::string& fname)
int p = 0;
// Select root wmo files
char const* rchr = strrchr(plain_name, '_');
if (rchr != NULL)
if (rchr != nullptr)
{
char cpy[4];
memcpy(cpy, rchr, 4);

6
src/tools/vmap4_extractor/wdtfile.cpp
View File

@@ -13,12 +13,12 @@ char * wdtGetPlainName(char * FileName)
{
char * szTemp;
if((szTemp = strrchr(FileName, '\\')) != NULL)
if((szTemp = strrchr(FileName, '\\')) != nullptr)
FileName = szTemp + 1;
return FileName;
}
WDTFile::WDTFile(char* file_name, char* file_name1) : WDT(file_name), gWmoInstansName(NULL), gnWMO(0)
WDTFile::WDTFile(char* file_name, char* file_name1) : WDT(file_name), gWmoInstansName(nullptr), gnWMO(0)
{
filename.append(file_name1,strlen(file_name1));
}
@@ -109,7 +109,7 @@ WDTFile::~WDTFile(void)
ADTFile* WDTFile::GetMap(int x, int z)
{
if(!(x>=0 && z >= 0 && x<64 && z<64))
return NULL;
return nullptr;
char name[512];

2
src/tools/vmap4_extractor/wmo.cpp
View File

@@ -473,7 +473,7 @@ WMOGroup::~WMOGroup()
}
WMOInstance::WMOInstance(MPQFile& f, char const* WmoInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE* pDirfile)
: currx(0), curry(0), wmo(NULL), doodadset(0), pos(), indx(0), id(0), d2(0), d3(0)
: currx(0), curry(0), wmo(nullptr), doodadset(0), pos(), indx(0), id(0), d2(0), d3(0)
{
float ff[3];
f.read(&id, 4);