Core: Fix many "errors"/warnings and coding style (1)

Extractors, worldserver, authserver, shared and collision affected

Errors were found using Cppcheck, open-source static analysis tool

src/tools/vmap4_extractor/model.cpp

@@ -26,15 +26,14 @@
 
 Model::Model(std::string &filename) : filename(filename), vertices(0), indices(0)
 {
+    memset(&header, 0, sizeof(header));
 }
 
 bool Model::open()
 {
     MPQFile f(filename.c_str());
 
-    ok = !f.isEof();
-
-    if (!ok)
+    if (f.isEof())
     {
         f.close();
         // Do not show this error on console to avoid confusion, the extractor can continue working even if some models fail to load
@@ -52,9 +51,7 @@ bool Model::open()
         vertices = new Vec3D[header.nBoundingVertices];
         f.read(vertices,header.nBoundingVertices*12);
         for (uint32 i=0; i<header.nBoundingVertices; i++)
-        {
             vertices[i] = fixCoordSystem(vertices[i]);
-        }
         f.seek(0);
         f.seekRelative(header.ofsBoundingTriangles);
         indices = new uint16[header.nBoundingTriangles];
@@ -73,13 +70,13 @@ bool Model::open()
 bool Model::ConvertToVMAPModel(const char * outfilename)
 {
     int N[12] = {0,0,0,0,0,0,0,0,0,0,0,0};
-    FILE * output=fopen(outfilename,"wb");
-    if(!output)
+    FILE* output=fopen(outfilename, "wb");
+    if (!output)
     {
         printf("Can't create the output file '%s'\n",outfilename);
         return false;
     }
-    fwrite(szRawVMAPMagic,8,1,output);
+    fwrite(szRawVMAPMagic, 8, 1, output);
     uint32 nVertices = 0;
     nVertices = header.nBoundingVertices;
     fwrite(&nVertices, sizeof(int), 1, output);
@@ -101,20 +98,18 @@ bool Model::ConvertToVMAPModel(const char * outfilename)
     wsize = sizeof(uint32) + sizeof(unsigned short) * nIndexes;
     fwrite(&wsize, sizeof(int), 1, output);
     fwrite(&nIndexes, sizeof(uint32), 1, output);
-    if(nIndexes >0)
-    {
+    if (nIndexes >0)
         fwrite(indices, sizeof(unsigned short), nIndexes, output);
-    }
-    fwrite("VERT",4, 1, output);
+
+    fwrite("VERT", 4, 1, output);
     wsize = sizeof(int) + sizeof(float) * 3 * nVertices;
     fwrite(&wsize, sizeof(int), 1, output);
     fwrite(&nVertices, sizeof(int), 1, output);
-    if(nVertices >0)
+    if (nVertices >0)
     {
         for(uint32 vpos=0; vpos <nVertices; ++vpos)
-        {
             std::swap(vertices[vpos].y, vertices[vpos].z);
-        }
+
         fwrite(vertices, sizeof(float)*3, nVertices, output);
     }
 
@@ -134,24 +129,24 @@ Vec3D fixCoordSystem2(Vec3D v)
     return Vec3D(v.x, v.z, v.y);
 }
 
-ModelInstance::ModelInstance(MPQFile &f,const char* ModelInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE *pDirfile)
+ModelInstance::ModelInstance(MPQFile& f, char const* ModelInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE *pDirfile)
+    : model(NULL), d1(0), w(0.0f)
 {
     float ff[3];
     f.read(&id, 4);
-    f.read(ff,12);
-    pos = fixCoords(Vec3D(ff[0],ff[1],ff[2]));
-    f.read(ff,12);
-    rot = Vec3D(ff[0],ff[1],ff[2]);
-    f.read(&scale,4);
+    f.read(ff, 12);
+    pos = fixCoords(Vec3D(ff[0], ff[1], ff[2]));
+    f.read(ff, 12);
+    rot = Vec3D(ff[0], ff[1], ff[2]);
+    f.read(&scale, 4);
     // scale factor - divide by 1024. blizzard devs must be on crack, why not just use a float?
     sc = scale / 1024.0f;
 
     char tempname[512];
     sprintf(tempname, "%s/%s", szWorkDirWmo, ModelInstName);
-    FILE *input;
-    input = fopen(tempname, "r+b");
+    FILE* input = fopen(tempname, "r+b");
 
-    if(!input)
+    if (!input)
     {
         //printf("ModelInstance::ModelInstance couldn't open %s\n", tempname);
         return;
@@ -167,7 +162,9 @@ ModelInstance::ModelInstance(MPQFile &f,const char* ModelInstName, uint32 mapID,
 
     uint16 adtId = 0;// not used for models
     uint32 flags = MOD_M2;
-    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, name
     fwrite(&mapID, sizeof(uint32), 1, pDirfile);
     fwrite(&tileX, sizeof(uint32), 1, pDirfile);