Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove an unused and a duplicate typedef. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3711 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2008-02-07 17:02:25 +00:00
parent 0207ceb4c1
commit b5d2cc00b9
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ivis_common/bitimage.c
View File

@ -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);

2
lib/ivis_common/pietypes.h
View File

@ -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

2
src/game.c
View File

@ -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...

2
src/texture.c
View File

@ -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