adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Centralized NULL checking for Stamp drawing.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@849 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2003-03-03 05:29:20 +00:00
parent 02856f0cb4
commit 8ddfacdc0a
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/graphics/frame.c
-11
View File
@@ -155,20 +155,9 @@ DrawBatch (PPRIMITIVE lpBasePrim, PRIM_LINKS PrimLinks, register
TFB_Prim_Point (&lpWorkPrim->Object.Point, &color); TFB_Prim_Point (&lpWorkPrim->Object.Point, &color);
break; break;
case STAMP_PRIM: case STAMP_PRIM:
SrcFramePtr = (FRAMEPTR)(lpWorkPrim->Object.Stamp.frame);
if (SrcFramePtr == 0)
{
continue;
}
TFB_Prim_Stamp (&lpWorkPrim->Object.Stamp); TFB_Prim_Stamp (&lpWorkPrim->Object.Stamp);
break; break;
case STAMPFILL_PRIM: case STAMPFILL_PRIM:
SrcFramePtr = (FRAMEPTR)(lpWorkPrim->Object.Stamp.frame);
if (SrcFramePtr == 0)
{
continue;
}
c32k = GetPrimColor (lpWorkPrim) >> 8; //shift out color index c32k = GetPrimColor (lpWorkPrim) >> 8; //shift out color index
color.r = (c32k >> (10 - (8 - 5))) & 0xF8; color.r = (c32k >> (10 - (8 - 5))) & 0xF8;
color.g = (c32k >> (5 - (8 - 5))) & 0xF8; color.g = (c32k >> (5 - (8 - 5))) & 0xF8;
sc2/src/sc2code/libs/graphics/tfb_prim.c
+10
View File
@@ -121,6 +121,11 @@ TFB_Prim_Stamp (PSTAMP stmp)
int gscale; int gscale;
SrcFramePtr = (PFRAME_DESC)stmp->frame; SrcFramePtr = (PFRAME_DESC)stmp->frame;
if (!SrcFramePtr)
{
fprintf (stderr, "TFB_Prim_Stamp: Tried to draw a NULL frame (Stamp address = %p)\n", stmp);
return;
}
img = SrcFramePtr->image; img = SrcFramePtr->image;
gscale = GetGraphicScale (); gscale = GetGraphicScale ();
@@ -175,6 +180,11 @@ TFB_Prim_StampFill (PSTAMP stmp, TFB_Palette *color)
int gscale; int gscale;
SrcFramePtr = (PFRAME_DESC)stmp->frame; SrcFramePtr = (PFRAME_DESC)stmp->frame;
if (!SrcFramePtr)
{
fprintf (stderr, "TFB_Prim_StampFill: Tried to draw a NULL frame (Stamp address = %p)\n", stmp);
return;
}
img = SrcFramePtr->image; img = SrcFramePtr->image;
gscale = GetGraphicScale (); gscale = GetGraphicScale ();