From b5d2cc00b9f6a3bc212cd178f041cb314d34de67 Mon Sep 17 00:00:00 2001
From: Per Inge Mathisen <per@wz2100.net>
Date: Thu, 7 Feb 2008 17:02:25 +0000
Subject: [PATCH] Remove an unused and a duplicate typedef.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3711 4a71c877-e1ca-e34f-864e-861f7616d084
---
 lib/ivis_common/bitimage.c | 4 ++--
 lib/ivis_common/pietypes.h | 2 --
 src/game.c                 | 2 +-
 src/texture.c              | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/ivis_common/bitimage.c b/lib/ivis_common/bitimage.c
index b3d73ab7b..709dff1f9 100644
--- a/lib/ivis_common/bitimage.c
+++ b/lib/ivis_common/bitimage.c
@@ -32,12 +32,12 @@
 
 static unsigned short LoadTextureFile(const char *FileName)
 {
-	iTexture *pSprite;
+	iV_Image *pSprite;
 	unsigned int i;
 
 	ASSERT(resPresent("IMGPAGE", FileName), "Texture file \"%s\" not preloaded.", FileName);
 
-	pSprite = (iTexture*)resGetData("IMGPAGE", FileName);
+	pSprite = (iV_Image*)resGetData("IMGPAGE", FileName);
 	debug(LOG_TEXTURE, "Load texture from resource cache: %s (%d, %d)",
 	      FileName, pSprite->width, pSprite->height);
 
diff --git a/lib/ivis_common/pietypes.h b/lib/ivis_common/pietypes.h
index bfe697af4..fa6629279 100644
--- a/lib/ivis_common/pietypes.h
+++ b/lib/ivis_common/pietypes.h
@@ -40,8 +40,6 @@
 //*************************************************************************
 typedef struct { Vector3i p, r; } iView;
 
-typedef unsigned char iBitmap;
 typedef struct { unsigned int width, height, depth; unsigned char *bmp; } iV_Image;
-typedef iV_Image iTexture;
 
 #endif // _pieTypes_h
diff --git a/src/game.c b/src/game.c
index 5c2cd9a9d..5eadce683 100644
--- a/src/game.c
+++ b/src/game.c
@@ -11705,7 +11705,7 @@ static BOOL getNameFromComp(UDWORD compType, char *pDest, UDWORD compIndex)
 
 
 // draws the structures onto a completed map preview sprite.
-BOOL plotStructurePreview(iTexture *backDropSprite, UBYTE scale, UDWORD offX, UDWORD offY)
+BOOL plotStructurePreview(iV_Image *backDropSprite, UBYTE scale, UDWORD offX, UDWORD offY)
 {
 	SAVE_STRUCTURE				sSave;  // close eyes now.
 	SAVE_STRUCTURE				*psSaveStructure = &sSave; // assumes save_struct is larger than all previous ones...
diff --git a/src/texture.c b/src/texture.c
index 98790cf1a..9b6257b2b 100644
--- a/src/texture.c
+++ b/src/texture.c
@@ -201,7 +201,7 @@ void texLoad(const char *fileName)
 		// Load until we cannot find anymore of them
 		for (k = 0; k < MAX_TILES; k++)
 		{
-			iTexture tile;
+			iV_Image tile;
 
 			sprintf(fullPath, "%s/tile-%02d.png", partialPath, k);
 			if (PHYSFS_exists(fullPath)) // avoid dire warning