Core: header cleanup, split realmlist, boost compatibility, cotire, remove stormlib/zlib and stormlib/bzip2 and instead use dep sources

This commit is contained in:
ariel- committed 2018-03-28 04:41:59 -03:00
1 parent 7fff6c424f
commit 5ff847159c
1243 files changed
+29780 -36517

No files matched your search

+5 -5
View File
@@ -30,7 +30,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;
}
@@ -39,7 +39,7 @@ char* GetPlainName(char* FileName)
{
char * szTemp;
if ((szTemp = strrchr(FileName, '\\')) != NULL)
if ((szTemp = strrchr(FileName, '\\')) != nullptr)
FileName = szTemp + 1;
return FileName;
}
@@ -74,7 +74,7 @@ char* GetExtension(char* FileName)
{
if (char* szTemp = strrchr(FileName, '.'))
return szTemp;
return NULL;
return nullptr;
}
extern HANDLE WorldMpq;
@@ -199,7 +199,7 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY, uint32 originalMa
ModelInstance inst(ADT, ModelInstanceNames[id].c_str(), map_num, tileX, tileY, originalMapId, dirfile, dirfileCache);
}
delete[] ModelInstanceNames;
ModelInstanceNames = NULL;
ModelInstanceNames = nullptr;
}
}
else if (!strcmp(fourcc,"MODF"))
@@ -215,7 +215,7 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY, uint32 originalMa
}
delete[] WmoInstanceNames;
WmoInstanceNames = NULL;
WmoInstanceNames = nullptr;
}
}