Fixing some warnings

[lugaru.git] / Source / Graphic / Models.cpp

diff --git a/Source/Graphic/Models.cpp b/Source/Graphic/Models.cpp
index 38e2447085c528abba18ce2dfe35c2d77332f4bc..f58962c2f4ab5e3c5f57aea22b7f49f1f19abe26 100644 (file)
--- a/Source/Graphic/Models.cpp
+++ b/Source/Graphic/Models.cpp
@@ -30,8 +30,6 @@ extern float fadestart;
 extern float texdetail;
 extern bool decals;
 
-extern bool visibleloading;
-
 int Model::LineCheck(XYZ *p1, XYZ *p2, XYZ *p, XYZ *move, float *rotate)
 {
     static int j;
@@ -401,7 +399,7 @@ void Model::UpdateVertexArrayNoTexNoNorm()
     }
 }
 
-bool Model::loadnotex(const std::string& filename )
+bool Model::loadnotex(const std::string& filename)
 {
     FILE *tfile;
     long i;
@@ -465,7 +463,7 @@ bool Model::loadnotex(const std::string& filename )
 }
 
 
-bool Model::load(const std::string& filename, bool texture )
+bool Model::load(const std::string& filename, bool texture)
 {
     FILE *tfile;
     long i;
@@ -474,8 +472,7 @@ bool Model::load(const std::string& filename, bool texture )
 
     LOG(std::string("Loading model...") + filename);
 
-    if (visibleloading)
-        Game::LoadingScreen();
+    Game::LoadingScreen();
 
     type = normaltype;
     color = 0;
@@ -819,8 +816,7 @@ void Model::Rotate(float xang, float yang, float zang)
 
 void Model::CalculateNormals(bool facenormalise)
 {
-    if (visibleloading)
-        Game::LoadingScreen();
+    Game::LoadingScreen();
     static int i;
     if (type != normaltype && type != decalstype)
         return;
@@ -1358,7 +1354,6 @@ void Model::MakeDecal(int atype, XYZ where, float size, float opacity, float rot
 Model::~Model()
 {
     deallocate();
-    textureptr.destroy();
 }
 
 void Model::deallocate()
@@ -1434,20 +1429,17 @@ void Model::deallocate()
 }
 
 Model::Model()
+  : vertexNum(0), TriangleNum(0),
+    hastexture(0),
+    type(0), oldtype(0),
+    possible(0),
+    owner(0),
+    vertex(0),
+    normals(0),
+    facenormals(0),
+    Triangles(0),
+    vArray(0)
 {
-    vertexNum = 0, TriangleNum = 0;
-    hastexture = 0;
-
-    type = 0, oldtype = 0;
-
-    possible = 0;
-    owner = 0;
-    vertex = 0;
-    normals = 0;
-    facenormals = 0;
-    Triangles = 0;
-    vArray = 0;
-
     memset(&modelTexture, 0, sizeof(modelTexture));
     numpossible = 0;
     color = 0;
@@ -1469,4 +1461,3 @@ Model::Model()
 
     type = nothing;
 }
-