Reinstitute the cosmetic cleanups that should have been a separate commit from r5484 and were reverted in r5723.

git-svn-id: https://svn.eduke32.com/eduke32@5856 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-09-09 03:12:20 +00:00
parent 750ceb932c
commit b73f2f3e17

View file

@ -1651,12 +1651,11 @@ static int get_screen_coords(const vec2_t p1, const vec2_t p2,
// //
static void scansector(int16_t startsectnum) static void scansector(int16_t startsectnum)
{ {
int32_t sectorbordercnt;
if (startsectnum < 0) if (startsectnum < 0)
return; return;
sectorborder[0] = startsectnum, sectorbordercnt = 1; sectorborder[0] = startsectnum;
int32_t sectorbordercnt = 1;
do do
{ {
@ -1669,17 +1668,16 @@ static void scansector(int16_t startsectnum)
{ {
const uspritetype *const spr = (uspritetype *)&sprite[i]; const uspritetype *const spr = (uspritetype *)&sprite[i];
if (((spr->cstat&0x8000) == 0 || showinvisibility) && if (((spr->cstat & 0x8000) && !showinvisibility) || spr->xrepeat == 0 || spr->yrepeat == 0)
spr->xrepeat > 0 && spr->yrepeat > 0) continue;
{
int32_t xs = spr->x-globalposx, ys = spr->y-globalposy;
if ((spr->cstat&48) || ((coord_t)xs*cosglobalang+(coord_t)ys*singlobalang > 0)) vec2_t const s = { spr->x-globalposx, spr->y-globalposy };
if ((spr->cstat&(64+48))!=(64+16) || dmulscale6(sintable[(spr->ang+512)&2047],-xs, sintable[spr->ang&2047],-ys) > 0)
if ((spr->cstat&48) || ((coord_t)s.x*cosglobalang+(coord_t)s.y*singlobalang > 0))
if ((spr->cstat&(64+48))!=(64+16) || dmulscale6(sintable[(spr->ang+512)&2047],-s.x, sintable[spr->ang&2047],-s.y) > 0)
if (engine_addtsprite(i, sectnum)) if (engine_addtsprite(i, sectnum))
break; break;
} }
}
gotsector[sectnum>>3] |= pow2char[sectnum&7]; gotsector[sectnum>>3] |= pow2char[sectnum&7];