glDeleteTextures safely ignores zeroes

[lugaru.git] / Source / Models.cpp

diff --git a/Source/Models.cpp b/Source/Models.cpp
index e51bcfb786c7ce81c2406a1fa2926ae41b6829e1..bdc44dcdd2182a76278f95c4641a85ab1006d890 100644 (file)
--- a/Source/Models.cpp
+++ b/Source/Models.cpp
@@ -28,9 +28,7 @@ extern XYZ viewer;
 extern float fadestart;
 extern float texdetail;
 extern bool decals;
-extern int loadscreencolor;
 
-extern Game * pgame;
 extern bool visibleloading;
 
 int Model::LineCheck(XYZ *p1,XYZ *p2, XYZ *p, XYZ *move, float *rotate)
@@ -481,10 +479,8 @@ bool Model::load(const char *filename,bool texture )
 
        LOG(std::string("Loading model...") + filename);
 
-       if(visibleloading){
-               loadscreencolor=2;
-               pgame->LoadingScreen();
-       }
+       if(visibleloading)
+               Game::LoadingScreen();
 
        int oldvertexNum,oldTriangleNum;
        oldvertexNum=vertexNum;
@@ -846,10 +842,8 @@ void Model::Rotate(float xang,float yang,float zang)
 
 void Model::CalculateNormals(bool facenormalise)
 {
-       if(visibleloading){
-               loadscreencolor=3;
-               pgame->LoadingScreen();
-       }
+       if(visibleloading)
+               Game::LoadingScreen();
        static int i;
        if(type!=normaltype&&type!=decalstype)return;
 
@@ -1392,7 +1386,7 @@ Model::~Model()
 {
        deallocate();
 
-       if(textureptr) glDeleteTextures( 1, &textureptr );
+       glDeleteTextures( 1, &textureptr );
 }
 
 void Model::deallocate()