From 6110a716c63facd54bebce0329e797c0f5203192 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 24 Aug 2016 13:17:13 +0200 Subject: [PATCH] Core/Misc: Coding standards --- src/tools/map_extractor/System.cpp | 6 ++-- src/tools/map_extractor/adt.cpp | 4 +-- src/tools/vmap4_extractor/adtfile.cpp | 10 +++--- .../vmap4_extractor/gameobject_extract.cpp | 2 +- src/tools/vmap4_extractor/vmapexport.cpp | 26 +++++++-------- src/tools/vmap4_extractor/wdtfile.cpp | 6 ++-- src/tools/vmap4_extractor/wmo.cpp | 32 +++++++++---------- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp index 412e4bd58d..bfb624fe18 100644 --- a/src/tools/map_extractor/System.cpp +++ b/src/tools/map_extractor/System.cpp @@ -155,7 +155,7 @@ void CreateDir(std::string const& path) bool FileExists(TCHAR const* fileName) { int fp = _open(fileName, OPEN_FLAGS); - if(fp != -1) + if (fp != -1) { _close(fp); return true; @@ -321,7 +321,7 @@ void ReadLiquidTypeTableDBC() } DBCFile dbc(dbcFile); - if(!dbc.open()) + if (!dbc.open()) { printf("Fatal error: Invalid LiquidType.dbc file format!\n"); exit(1); @@ -1019,7 +1019,7 @@ void ExtractMapsFromMpq(uint32 build) bool ExtractFile(HANDLE fileInArchive, char const* filename) { FILE* output = fopen(filename, "wb"); - if(!output) + if (!output) { printf("Can't create the output file '%s'\n", filename); return false; diff --git a/src/tools/map_extractor/adt.cpp b/src/tools/map_extractor/adt.cpp index 7a900640d6..d5bc51fd57 100644 --- a/src/tools/map_extractor/adt.cpp +++ b/src/tools/map_extractor/adt.cpp @@ -36,8 +36,8 @@ bool isHole(int holes, int i, int j) { int testi = i / 2; int testj = j / 4; - if(testi > 3) testi = 3; - if(testj > 3) testj = 3; + if (testi > 3) testi = 3; + if (testj > 3) testj = 3; return (holes & holetab_h[testi] & holetab_v[testj]) != 0; } diff --git a/src/tools/vmap4_extractor/adtfile.cpp b/src/tools/vmap4_extractor/adtfile.cpp index 84d7745132..7f12bdb7ad 100644 --- a/src/tools/vmap4_extractor/adtfile.cpp +++ b/src/tools/vmap4_extractor/adtfile.cpp @@ -30,7 +30,7 @@ char const* GetPlainName(char const* FileName) { const char * szTemp; - if((szTemp = strrchr(FileName, '\\')) != NULL) + if ((szTemp = strrchr(FileName, '\\')) != NULL) FileName = szTemp + 1; return FileName; } @@ -39,7 +39,7 @@ char* GetPlainName(char* FileName) { char * szTemp; - if((szTemp = strrchr(FileName, '\\')) != NULL) + if ((szTemp = strrchr(FileName, '\\')) != NULL) FileName = szTemp + 1; return FileName; } @@ -65,7 +65,7 @@ void FixNameSpaces(char* name, size_t len) { for (size_t i=0; i]\n", argv[0]); @@ -488,7 +488,7 @@ bool processArgv(int argc, char ** argv, const char *versionString) printf(" -? : This message.\n"); } - if(!hasInputPathParam) + if (!hasInputPathParam) getGamePath(); return result; diff --git a/src/tools/vmap4_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp index 1815149dd7..231bd81120 100644 --- a/src/tools/vmap4_extractor/wdtfile.cpp +++ b/src/tools/vmap4_extractor/wdtfile.cpp @@ -26,7 +26,7 @@ char * wdtGetPlainName(char * FileName) { char * szTemp; - if((szTemp = strrchr(FileName, '\\')) != NULL) + if ((szTemp = strrchr(FileName, '\\')) != NULL) FileName = szTemp + 1; return FileName; } @@ -52,7 +52,7 @@ bool WDTFile::init(char* /*map_id*/, unsigned int mapID) std::string dirname = std::string(szWorkDirWmo) + "/dir_bin"; FILE *dirfile; dirfile = fopen(dirname.c_str(), "ab"); - if(!dirfile) + if (!dirfile) { printf("Can't open dirfile!'%s'\n", dirname.c_str()); return false; @@ -124,7 +124,7 @@ WDTFile::~WDTFile(void) ADTFile* WDTFile::GetMap(int x, int z) { - if(!(x>=0 && z >= 0 && x<64 && z<64)) + if (!(x>=0 && z >= 0 && x<64 && z<64)) return NULL; char name[512]; diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp index c0ad9ceef2..0a4f62d493 100644 --- a/src/tools/vmap4_extractor/wmo.cpp +++ b/src/tools/vmap4_extractor/wmo.cpp @@ -42,7 +42,7 @@ extern HANDLE WorldMpq; bool WMORoot::open() { MPQFile f(WorldMpq, filename.c_str()); - if(f.isEof ()) + if (f.isEof ()) { printf("No such file.\n"); return false; @@ -150,7 +150,7 @@ WMOGroup::WMOGroup(const std::string &filename) : bool WMOGroup::open() { MPQFile f(WorldMpq, filename.c_str()); - if(f.isEof ()) + if (f.isEof ()) { printf("No such file.\n"); return false; @@ -272,50 +272,50 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool precise uint32 nIdexes = nTriangles * 3; - if(fwrite("INDX",4, 1, output) != 1) + if (fwrite("INDX",4, 1, output) != 1) { printf("Error while writing file nbraches ID"); exit(0); } int wsize = sizeof(uint32) + sizeof(unsigned short) * nIdexes; - if(fwrite(&wsize, sizeof(int), 1, output) != 1) + if (fwrite(&wsize, sizeof(int), 1, output) != 1) { printf("Error while writing file wsize"); // no need to exit? } - if(fwrite(&nIdexes, sizeof(uint32), 1, output) != 1) + if (fwrite(&nIdexes, sizeof(uint32), 1, output) != 1) { printf("Error while writing file nIndexes"); exit(0); } - if(nIdexes >0) + if (nIdexes >0) { - if(fwrite(MOVI, sizeof(unsigned short), nIdexes, output) != nIdexes) + if (fwrite(MOVI, sizeof(unsigned short), nIdexes, output) != nIdexes) { printf("Error while writing file indexarray"); exit(0); } } - if(fwrite("VERT",4, 1, output) != 1) + if (fwrite("VERT",4, 1, output) != 1) { printf("Error while writing file nbraches ID"); exit(0); } wsize = sizeof(int) + sizeof(float) * 3 * nVertices; - if(fwrite(&wsize, sizeof(int), 1, output) != 1) + if (fwrite(&wsize, sizeof(int), 1, output) != 1) { printf("Error while writing file wsize"); // no need to exit? } - if(fwrite(&nVertices, sizeof(int), 1, output) != 1) + if (fwrite(&nVertices, sizeof(int), 1, output) != 1) { printf("Error while writing file nVertices"); exit(0); } - if(nVertices >0) + if (nVertices >0) { - if(fwrite(MOVT, sizeof(float)*3, nVertices, output) != nVertices) + if (fwrite(MOVT, sizeof(float)*3, nVertices, output) != nVertices) { printf("Error while writing file vectors"); exit(0); @@ -390,7 +390,7 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, WMORoot *rootWMO, bool precise int check = 3*nColVertices; fwrite(VERT,4,3,output); for (uint32 i=0; i= 0) + if (IndexRenum[i] >= 0) check -= fwrite(MOVT+3*i, sizeof(float), 3, output); assert(check==0); @@ -509,7 +509,7 @@ WMOInstance::WMOInstance(MPQFile& f, char const* WmoInstName, uint32 mapID, uint FILE *input; input = fopen(tempname, "r+b"); - if(!input) + if (!input) { printf("WMOInstance::WMOInstance: couldn't open %s\n", tempname); return; @@ -526,7 +526,7 @@ WMOInstance::WMOInstance(MPQFile& f, char const* WmoInstName, uint32 mapID, uint float x,z; x = pos.x; z = pos.z; - if(x==0 && z == 0) + if (x==0 && z == 0) { pos.x = 533.33333f*32; pos.z = 533.33333f*32; @@ -537,7 +537,7 @@ WMOInstance::WMOInstance(MPQFile& f, char const* WmoInstName, uint32 mapID, uint float scale = 1.0f; uint32 flags = MOD_HAS_BOUND; - if(tileX == 65 && tileY == 65) flags |= MOD_WORLDSPAWN; + if (tileX == 65 && tileY == 65) flags |= MOD_WORLDSPAWN; //write mapID, tileX, tileY, Flags, ID, Pos, Rot, Scale, Bound_lo, Bound_hi, name fwrite(&mapID, sizeof(uint32), 1, pDirfile); fwrite(&tileX, sizeof(uint32), 1, pDirfile);