zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix addclipsect() accidentally being nested under #ifdef HAVE_CLIPSHAPE_FEATURE

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7580 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-04-18 17:23:42 +00:00 committed by Christoph Oelckers
parent e5c979c997
commit e2be7183b4
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -611,6 +611,18 @@ int clipinsideboxline(int x, int y, int x1, int y1, int x2, int y2, int walldist
return (x2 >= y2) << 1; return (x2 >= y2) << 1;
} }
static int32_t clipmove_warned;
static inline void addclipsect(int const sectnum)
{
if (EDUKE32_PREDICT_TRUE(clipsectnum < MAXCLIPSECTORS))
{
bitmap_set(clipsectormap, sectnum);
clipsectorlist[clipsectnum++] = sectnum;
}
else
clipmove_warned |= 1;
}
#ifdef HAVE_CLIPSHAPE_FEATURE #ifdef HAVE_CLIPSHAPE_FEATURE
int32_t clipsprite_try(uspritetype const * const spr, int32_t xmin, int32_t ymin, int32_t xmax, int32_t ymax) int32_t clipsprite_try(uspritetype const * const spr, int32_t xmin, int32_t ymin, int32_t xmax, int32_t ymax)
@ -654,18 +666,6 @@ int32_t clipsprite_try(uspritetype const * const spr, int32_t xmin, int32_t ymin
return 0; return 0;
} }
static int32_t clipmove_warned;
static inline void addclipsect(int const sectnum)
{
if (EDUKE32_PREDICT_TRUE(clipsectnum < MAXCLIPSECTORS))
{
bitmap_set(clipsectormap, sectnum);
clipsectorlist[clipsectnum++] = sectnum;
}
else 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
int32_t clipsprite_initindex(int32_t curidx, uspritetype const * const curspr, int32_t *clipsectcnt, const vec3_t *vect) int32_t clipsprite_initindex(int32_t curidx, uspritetype const * const curspr, int32_t *clipsectcnt, const vec3_t *vect)
{ {