zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve warnings spewed by clipmove() when attempting to consider too many things for clipping

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7572 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-04-10 09:31:05 +00:00 committed by Christoph Oelckers
parent 8a68bffdb0
commit ad59875fa3
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
source/build/src/clip.cpp
View file

@ -644,7 +644,7 @@ int32_t clipsprite_try(uspritetype const * const spr, int32_t xmin, int32_t ymin
(spr->x > xmax + maxcorrection) || (spr->y > ymax + maxcorrection)) (spr->x > xmax + maxcorrection) || (spr->y > ymax + maxcorrection))
return 1; return 1;
if (clipspritenum < MAXCLIPNUM) if (EDUKE32_PREDICT_TRUE(clipspritenum < MAXCLIPNUM))
clipspritelist[clipspritenum++] = spr-(uspritetype *)sprite; clipspritelist[clipspritenum++] = spr-(uspritetype *)sprite;
//initprintf("%d: clip sprite[%d]\n",clipspritenum,j); //initprintf("%d: clip sprite[%d]\n",clipspritenum,j);
return 1; return 1;
@ -655,15 +655,11 @@ int32_t clipsprite_try(uspritetype const * const spr, int32_t xmin, int32_t ymin
static int32_t clipmove_warned; static int32_t clipmove_warned;
static void addclipsect(int const sectnum) static inline void addclipsect(int const sectnum)
{ {
if (EDUKE32_PREDICT_TRUE(clipsectnum < MAXCLIPSECTORS)) if (EDUKE32_PREDICT_TRUE(clipsectnum < MAXCLIPSECTORS))
clipsectorlist[clipsectnum++] = sectnum; clipsectorlist[clipsectnum++] = sectnum;
else if (!clipmove_warned) else clipmove_warned |= 1;
{
OSD_Printf("!!clipsectnum\n");
clipmove_warned = 1;
}
} }
// return: -1 if curspr has x-flip xor y-flip (in the horizontal map plane!), 1 else // return: -1 if curspr has x-flip xor y-flip (in the horizontal map plane!), 1 else
@ -753,18 +749,14 @@ int32_t clipsprite_initindex(int32_t curidx, uspritetype const * const curspr, i
static void addclipline(int32_t dax1, int32_t day1, int32_t dax2, int32_t day2, int32_t daoval) static void addclipline(int32_t dax1, int32_t day1, int32_t dax2, int32_t day2, int32_t daoval)
{ {
if (clipnum < MAXCLIPNUM) if (EDUKE32_PREDICT_TRUE(clipnum < MAXCLIPNUM))
{ {
clipit[clipnum].x1 = dax1; clipit[clipnum].y1 = day1; clipit[clipnum].x1 = dax1; clipit[clipnum].y1 = day1;
clipit[clipnum].x2 = dax2; clipit[clipnum].y2 = day2; clipit[clipnum].x2 = dax2; clipit[clipnum].y2 = day2;
clipobjectval[clipnum] = daoval; clipobjectval[clipnum] = daoval;
clipnum++; clipnum++;
} }
else if (!clipmove_warned) else clipmove_warned |= 2;
{
initprintf("!!clipnum\n");
clipmove_warned = 2;
}
} }
static FORCE_INLINE void clipmove_tweak_pos(const vec3_t *pos, int32_t gx, int32_t gy, int32_t x1, int32_t y1, int32_t x2, static FORCE_INLINE void clipmove_tweak_pos(const vec3_t *pos, int32_t gx, int32_t gy, int32_t x1, int32_t y1, int32_t x2,
@ -1157,6 +1149,12 @@ int32_t clipmove(vec3_t * const pos, int16_t * const sectnum, int32_t xvect, int
} }
} }
if (EDUKE32_PREDICT_FALSE(clipmove_warned & 1))
OSD_Printf("clipsectnum >= MAXCLIPSECTORS!\n");
if (EDUKE32_PREDICT_FALSE(clipmove_warned & 2))
OSD_Printf("clipnum >= MAXCLIPNUM!\n");
////////// Sprites ////////// ////////// Sprites //////////
if (dasprclipmask==0) if (dasprclipmask==0)