stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-13 06:13:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

whitespace cleanup

Browse source
This commit is contained in:
Alam Ed Arias 2025-03-03 07:41:42 -05:00
parent d232ebafc3
commit c7396e86ef
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/p_maputl.c
View file

@ -1053,7 +1053,7 @@ boolean P_BlockLinesIterator(INT32 x, INT32 y, boolean (*func)(line_t *))
boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean (*func)(mobj_t *), mobj_t *thing) boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean (*func)(mobj_t *), mobj_t *thing)
{ {
blocknode_t *block, *next = NULL; blocknode_t *block, *next = NULL;
boolean checkthing = false; boolean checkthing = false;
if (thing) if (thing)
checkthing = true; checkthing = true;
@ -1473,12 +1473,12 @@ boolean P_PathTraverse(fixed_t px1, fixed_t py1, fixed_t px2, fixed_t py2,
trace.y = py1; trace.y = py1;
trace.dx = px2 - px1; trace.dx = px2 - px1;
trace.dy = py2 - py1; trace.dy = py2 - py1;
xt1 = px1>>MAPBLOCKSHIFT; xt1 = px1>>MAPBLOCKSHIFT;
yt1 = py2>>MAPBLOCKSHIFT; yt1 = py2>>MAPBLOCKSHIFT;
px1 = (unsigned)(px1 - bmaporgx); px1 = (unsigned)(px1 - bmaporgx);
py1 = (unsigned)(py1 - bmaporgy); py1 = (unsigned)(py1 - bmaporgy);
xt2 = px2>>MAPBLOCKSHIFT; xt2 = px2>>MAPBLOCKSHIFT;
yt2 = py2>>MAPBLOCKSHIFT; yt2 = py2>>MAPBLOCKSHIFT;
px2 = (unsigned)(px2 - bmaporgx); px2 = (unsigned)(px2 - bmaporgx);
@ -1524,11 +1524,11 @@ boolean P_PathTraverse(fixed_t px1, fixed_t py1, fixed_t px2, fixed_t py2,
xstep = 256*FRACUNIT; xstep = 256*FRACUNIT;
} }
xintercept = ((unsigned)px1>>MAPBTOFRAC) + FixedMul(partialy, xstep); xintercept = ((unsigned)px1>>MAPBTOFRAC) + FixedMul(partialy, xstep);
// [RH] Fix for traces that pass only through blockmap corners. In that case, // [RH] Fix for traces that pass only through blockmap corners. In that case,
// xintercept and yintercept can both be set ahead of mapx and mapy, so the // xintercept and yintercept can both be set ahead of mapx and mapy, so the
// for loop would never advance anywhere. // for loop would never advance anywhere.
if (abs(xstep) == 1 && abs(ystep) == 1) if (abs(xstep) == 1 && abs(ystep) == 1)
{ {
if (ystep < 0) if (ystep < 0)
@ -1545,7 +1545,7 @@ boolean P_PathTraverse(fixed_t px1, fixed_t py1, fixed_t px2, fixed_t py2,
yintercept = yt1; yintercept = yt1;
} }
} }
xt1 = (unsigned)px1>>MAPBLOCKSHIFT; xt1 = (unsigned)px1>>MAPBLOCKSHIFT;
yt1 = (unsigned)py1>>MAPBLOCKSHIFT; yt1 = (unsigned)py1>>MAPBLOCKSHIFT;
xt2 = (unsigned)px2>>MAPBLOCKSHIFT; xt2 = (unsigned)px2>>MAPBLOCKSHIFT;
@ -1577,21 +1577,21 @@ boolean P_PathTraverse(fixed_t px1, fixed_t py1, fixed_t px2, fixed_t py2,
case 0: // neither xintercept nor yintercept match! case 0: // neither xintercept nor yintercept match!
count = 64; // Stop traversing, because somebody screwed up. count = 64; // Stop traversing, because somebody screwed up.
break; break;
case 1: // xintercept matches case 1: // xintercept matches
xintercept += xstep; xintercept += xstep;
mapy += mapystep; mapy += mapystep;
if (mapy == yt2) if (mapy == yt2)
mapystep = 0; mapystep = 0;
break; break;
case 2: // yintercept matches case 2: // yintercept matches
yintercept += ystep; yintercept += ystep;
mapx += mapxstep; mapx += mapxstep;
if (mapx == xt2) if (mapx == xt2)
mapxstep = 0; mapxstep = 0;
break; break;
case 3: // xintercept and yintercept both match case 3: // xintercept and yintercept both match
// The trace is exiting a block through its corner. Not only does the block // The trace is exiting a block through its corner. Not only does the block
// being entered need to be checked (which will happen when this loop // being entered need to be checked (which will happen when this loop
@ -1604,7 +1604,7 @@ boolean P_PathTraverse(fixed_t px1, fixed_t py1, fixed_t px2, fixed_t py2,
if (!P_BlockLinesIterator(mapx, mapy + mapystep, PIT_AddLineIntercepts)) if (!P_BlockLinesIterator(mapx, mapy + mapystep, PIT_AddLineIntercepts))
return false; // early out return false; // early out
} }
if (flags & PT_ADDTHINGS) if (flags & PT_ADDTHINGS)
{ {
if (!P_BlockThingsIterator(mapx + mapxstep, mapy, PIT_AddThingIntercepts, NULL)) if (!P_BlockThingsIterator(mapx + mapxstep, mapy, PIT_AddThingIntercepts, NULL))
@ -1612,7 +1612,7 @@ boolean P_PathTraverse(fixed_t px1, fixed_t py1, fixed_t px2, fixed_t py2,
if (!P_BlockThingsIterator(mapx, mapy + mapystep, PIT_AddThingIntercepts, NULL)) if (!P_BlockThingsIterator(mapx, mapy + mapystep, PIT_AddThingIntercepts, NULL))
return false; // early out return false; // early out
} }
xintercept += xstep; xintercept += xstep;
yintercept += ystep; yintercept += ystep;
mapx += mapxstep; mapx += mapxstep;