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

Add assert-or-return workarounds for some crashes reported by zydonk on the forums. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7835 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2009-07-13 19:26:16 +00:00 committed by Git SVN Gateway
parent 72a10b7cc7
commit 11335e28a9
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ivis_common/ivisdef.h
View File

@ -126,9 +126,10 @@ typedef struct {
int YOffset; /**< Y offset into source position */
} IMAGEDEF;
#define MAX_NUM_TPAGEIDS 16
typedef struct {
int NumImages; /**< Number of images contained here */
int TPageIDs[16]; /**< OpenGL Texture IDs */
int TPageIDs[MAX_NUM_TPAGEIDS]; /**< OpenGL Texture IDs */
IMAGEDEF *ImageDefs; /**< Stored images */
} IMAGEFILE;

7
lib/ivis_opengl/pieblitfunc.c
View File

@ -163,9 +163,10 @@ void pie_ImageFileID(IMAGEFILE *ImageFile, UWORD ID, int x, int y)
PIEIMAGE pieImage;
PIERECT dest;
assert(ID < ImageFile->NumImages);
ASSERT_OR_RETURN(, ID < ImageFile->NumImages, "Out of range 1: %d", (int)Image->TPageID);
Image = &ImageFile->ImageDefs[ID];
ASSERT_OR_RETURN(, Image->TPageID < MAX_NUM_TPAGEIDS, "Out of range 2: %d", (int)Image->TPageID);
pie_SetRendMode(REND_ALPHA_TEX);
pie_SetAlphaTest(true);
@ -188,10 +189,10 @@ void pie_ImageFileIDTile(IMAGEFILE *ImageFile, UWORD ID, int x, int y, int Width
PIEIMAGE pieImage;
PIERECT dest;
assert(ID < ImageFile->NumImages);
ASSERT_OR_RETURN(, ID < ImageFile->NumImages, "Out of range 1: %d", (int)Image->TPageID);
Image = &ImageFile->ImageDefs[ID];
ASSERT_OR_RETURN(, Image->TPageID < MAX_NUM_TPAGEIDS, "Out of range 2: %d", (int)Image->TPageID);
pie_SetRendMode(REND_GOURAUD_TEX);
pie_SetAlphaTest(true);

1
lib/ivis_opengl/piestate.c
View File

@ -167,6 +167,7 @@ void pie_SetTexturePage(SDWORD num)
{
glEnable(GL_TEXTURE_2D);
}
ASSERT_OR_RETURN(, num < iV_TEX_MAX, "Index out of bounds: %d", num);
glBindTexture(GL_TEXTURE_2D, _TEX_PAGE[num].id);
}
rendStates.texPage = num;