X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FModels.cpp;h=4120864b74146e015f0b4830462cfc40e908a759;hb=b32cd80b243d77cd80e026c7ae73e33ec39b1de9;hp=649bcdef904c2d26eed36d48dc1510f76ea983e1;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7;p=lugaru.git

diff --git a/Source/Graphic/Models.cpp b/Source/Graphic/Models.cpp
index 649bcde..4120864 100644
--- 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;
@@ -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;
@@ -930,15 +926,7 @@ void Model::drawdifftex(GLuint texture)
     glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
     glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
 
-
-#ifndef WIN32
-    glLockArraysEXT( 0, TriangleNum * 3);
-#endif
     glDrawArrays(GL_TRIANGLES, 0, TriangleNum * 3);
-#ifndef WIN32
-    glUnlockArraysEXT();
-#endif
-
 
     if (!color)
         glDisableClientState(GL_NORMAL_ARRAY);
@@ -962,15 +950,7 @@ void Model::drawdifftex(Texture texture)
     glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
     glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
 
-
-#ifndef WIN32
-    glLockArraysEXT( 0, TriangleNum * 3);
-#endif
     glDrawArrays(GL_TRIANGLES, 0, TriangleNum * 3);
-#ifndef WIN32
-    glUnlockArraysEXT();
-#endif
-
 
     if (!color)
         glDisableClientState(GL_NORMAL_ARRAY);
@@ -1374,7 +1354,6 @@ void Model::MakeDecal(int atype, XYZ where, float size, float opacity, float rot
 Model::~Model()
 {
     deallocate();
-    textureptr.destroy();
 }
 
 void Model::deallocate()
@@ -1447,7 +1426,7 @@ void Model::deallocate()
     free(decalposition);
     decalposition = 0;
 
-};
+}
 
 Model::Model()
 {