From 263a338c0c3648cfa2388d4a21584a09294ffd9e Mon Sep 17 00:00:00 2001
From: sf17k <sf171k@gmail.com>
Date: Fri, 3 Jun 2011 15:57:10 -0400
Subject: [PATCH] glDeleteTextures safely ignores zeroes

---
 Source/GameInitDispose.cpp | 13 ++++---------
 Source/Models.cpp          |  2 +-
 Source/Objects.cpp         |  8 ++++----
 Source/Skybox.cpp          | 12 ++++++------
 Source/Sprite.cpp          | 22 +++++++++++-----------
 Source/Terrain.cpp         | 14 +++++++-------
 Source/Text.cpp            |  2 +-
 Source/Texture.cpp         |  3 +--
 Source/Weapons.cpp         | 14 +++++++-------
 9 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index ee82765..8c09179 100644
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -142,17 +142,15 @@ void Game::deleteGame(){
         delete skybox;
     if(text)
         delete text;
-    for(int i=0;i<10;i++){
-        if(Mainmenuitems[i])glDeleteTextures( 1, &Mainmenuitems[i] );
-    }
+    glDeleteTextures( 10, &Mainmenuitems[0] );
     glDeleteTextures( 1, &cursortexture );
     glDeleteTextures( 1, &Maparrowtexture );
     glDeleteTextures( 1, &Mapboxtexture );
     glDeleteTextures( 1, &Mapcircletexture );
     glDeleteTextures( 1, &terraintexture );
     glDeleteTextures( 1, &terraintexture2 );
-    if(screentexture>0)glDeleteTextures( 1, &screentexture );
-    if(screentexture2>0)glDeleteTextures( 1, &screentexture2 );
+    glDeleteTextures( 1, &screentexture );
+    glDeleteTextures( 1, &screentexture2 );
     glDeleteTextures( 1, &hawktexture );
     glDeleteTextures( 1, &logotexture );
     glDeleteTextures( 1, &loadscreentexture );
@@ -754,10 +752,7 @@ void Game::LoadStuff()
 
 	for(i=0;i<maxplayers;i++)
 	{
-		if (glIsTexture(player[i].skeleton.drawmodel.textureptr))
-		{
-			glDeleteTextures(1, &player[i].skeleton.drawmodel.textureptr);
-		}
+        glDeleteTextures(1, &player[i].skeleton.drawmodel.textureptr);
 		player[i].skeleton.drawmodel.textureptr=0;;
 	}
 
diff --git a/Source/Models.cpp b/Source/Models.cpp
index f49ddd0..bdc44dc 100644
--- a/Source/Models.cpp
+++ b/Source/Models.cpp
@@ -1386,7 +1386,7 @@ Model::~Model()
 {
 	deallocate();
 
-	if(textureptr) glDeleteTextures( 1, &textureptr );
+	glDeleteTextures( 1, &textureptr );
 }
 
 void Model::deallocate()
diff --git a/Source/Objects.cpp b/Source/Objects.cpp
index 353fa6e..de603c1 100644
--- a/Source/Objects.cpp
+++ b/Source/Objects.cpp
@@ -787,9 +787,9 @@ Objects::Objects()
 
 Objects::~Objects()
 {
-	if (boxtextureptr) glDeleteTextures( 1, &boxtextureptr );
-	if (treetextureptr) glDeleteTextures( 1, &treetextureptr );
-	if (bushtextureptr) glDeleteTextures( 1, &bushtextureptr );
-	if (rocktextureptr) glDeleteTextures( 1, &rocktextureptr );
+	glDeleteTextures( 1, &boxtextureptr );
+	glDeleteTextures( 1, &treetextureptr );
+	glDeleteTextures( 1, &bushtextureptr );
+	glDeleteTextures( 1, &rocktextureptr );
 };
 
diff --git a/Source/Skybox.cpp b/Source/Skybox.cpp
index 5c4aaab..f42dd4d 100644
--- a/Source/Skybox.cpp
+++ b/Source/Skybox.cpp
@@ -134,11 +134,11 @@ void	SkyBox::draw()
 
 SkyBox::~SkyBox()
 {
-	if (front) glDeleteTextures( 1, &front );
-	if (left) glDeleteTextures( 1, &left );
-	if (back) glDeleteTextures( 1, &back );
-	if (right) glDeleteTextures( 1, &right );
-	if (up) glDeleteTextures( 1, &up );
-	if (down) glDeleteTextures( 1, &down );
+	glDeleteTextures( 1, &front );
+	glDeleteTextures( 1, &left );
+	glDeleteTextures( 1, &back );
+	glDeleteTextures( 1, &right );
+	glDeleteTextures( 1, &up );
+	glDeleteTextures( 1, &down );
 };
 
diff --git a/Source/Sprite.cpp b/Source/Sprite.cpp
index dbc9c23..79a5af4 100644
--- a/Source/Sprite.cpp
+++ b/Source/Sprite.cpp
@@ -438,16 +438,16 @@ Sprite::Sprite()
 
 void Sprite::clearTextures()
 {
-	if (toothtexture) glDeleteTextures( 1, &toothtexture );
-	if (cloudtexture) glDeleteTextures( 1, &cloudtexture );
-	if (cloudimpacttexture) glDeleteTextures( 1, &cloudimpacttexture );
-	if (bloodtexture) glDeleteTextures( 1, &bloodtexture );
-	if (flametexture) glDeleteTextures( 1, &flametexture );
-	if (bloodflametexture) glDeleteTextures( 1, &bloodflametexture );
-	if (smoketexture) glDeleteTextures( 1, &smoketexture );
-	if (snowflaketexture) glDeleteTextures( 1, &snowflaketexture );
-	if (shinetexture) glDeleteTextures( 1, &shinetexture );
-	if (splintertexture) glDeleteTextures( 1, &splintertexture );
-	if (leaftexture) glDeleteTextures( 1, &leaftexture );
+	glDeleteTextures( 1, &toothtexture );
+	glDeleteTextures( 1, &cloudtexture );
+	glDeleteTextures( 1, &cloudimpacttexture );
+	glDeleteTextures( 1, &bloodtexture );
+	glDeleteTextures( 1, &flametexture );
+	glDeleteTextures( 1, &bloodflametexture );
+	glDeleteTextures( 1, &smoketexture );
+	glDeleteTextures( 1, &snowflaketexture );
+	glDeleteTextures( 1, &shinetexture );
+	glDeleteTextures( 1, &splintertexture );
+	glDeleteTextures( 1, &leaftexture );
 }
 
diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp
index 74afa40..acdc322 100644
--- a/Source/Terrain.cpp
+++ b/Source/Terrain.cpp
@@ -1563,12 +1563,12 @@ Terrain::Terrain()
 }
 Terrain::~Terrain()
 {
-	if(terraintexture)glDeleteTextures( 1, &terraintexture );
-	if(shadowtexture) glDeleteTextures( 1, &shadowtexture );
-	if(bodyprinttexture) glDeleteTextures( 1, &bodyprinttexture );
-	if(footprinttexture) glDeleteTextures( 1, &footprinttexture );
-	if(bloodtexture) glDeleteTextures( 1, &bloodtexture );
-	if(bloodtexture2) glDeleteTextures( 1, &bloodtexture2 );
-	if(breaktexture) glDeleteTextures( 1, &breaktexture );
+	glDeleteTextures( 1, &terraintexture );
+	glDeleteTextures( 1, &shadowtexture );
+	glDeleteTextures( 1, &bodyprinttexture );
+	glDeleteTextures( 1, &footprinttexture );
+	glDeleteTextures( 1, &bloodtexture );
+	glDeleteTextures( 1, &bloodtexture2 );
+	glDeleteTextures( 1, &breaktexture );
 }
 
diff --git a/Source/Text.cpp b/Source/Text.cpp
index 4c22f0f..11b1c8d 100644
--- a/Source/Text.cpp
+++ b/Source/Text.cpp
@@ -193,6 +193,6 @@ Text::~Text()
 		glDeleteLists(base, 512);
 		base = 0;
 	}
-	if (FontTexture) glDeleteTextures( 1, &FontTexture );
+	glDeleteTextures( 1, &FontTexture );
 }
 
diff --git a/Source/Texture.cpp b/Source/Texture.cpp
index 92c69d5..a8df84a 100644
--- a/Source/Texture.cpp
+++ b/Source/Texture.cpp
@@ -11,8 +11,7 @@ extern bool trilinear;
 
 Texture::~Texture()  {
 	free(array);
-	if(id)
-		glDeleteTextures(1,&id);
+    glDeleteTextures(1,&id);
 }
 
 void Texture::load()  {
diff --git a/Source/Weapons.cpp b/Source/Weapons.cpp
index 2f6a1ff..4d8f32e 100644
--- a/Source/Weapons.cpp
+++ b/Source/Weapons.cpp
@@ -1073,12 +1073,12 @@ Weapons::Weapons()
 
 Weapons::~Weapons()
 {
-	if (Weapon::stafftextureptr) glDeleteTextures( 1, &Weapon::stafftextureptr );
-	if (Weapon::knifetextureptr) glDeleteTextures( 1, &Weapon::knifetextureptr );
-	if (Weapon::lightbloodknifetextureptr) glDeleteTextures( 1, &Weapon::lightbloodknifetextureptr );
-	if (Weapon::bloodknifetextureptr) glDeleteTextures( 1, &Weapon::bloodknifetextureptr );
-	if (Weapon::swordtextureptr) glDeleteTextures( 1, &Weapon::swordtextureptr );
-	if (Weapon::lightbloodswordtextureptr) glDeleteTextures( 1, &Weapon::lightbloodswordtextureptr );
-	if (Weapon::bloodswordtextureptr) glDeleteTextures( 1, &Weapon::bloodswordtextureptr );
+	glDeleteTextures( 1, &Weapon::stafftextureptr );
+	glDeleteTextures( 1, &Weapon::knifetextureptr );
+	glDeleteTextures( 1, &Weapon::lightbloodknifetextureptr );
+	glDeleteTextures( 1, &Weapon::bloodknifetextureptr );
+	glDeleteTextures( 1, &Weapon::swordtextureptr );
+	glDeleteTextures( 1, &Weapon::lightbloodswordtextureptr );
+	glDeleteTextures( 1, &Weapon::bloodswordtextureptr );
 }
 
-- 
2.39.5