lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'tracer-angle-fix' into 'master' 

Line 457 Track Object Angle: Calculate input angle tolerance correctly

See merge request STJr/SRB2Internal!203
This commit is contained in:
Digiku 2018-11-14 11:31:54 -05:00
parent 6bb408da08 cf834f3503
commit cc3dd1f664
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_mobj.c
View File

@ -7454,7 +7454,7 @@ void P_MobjThinker(mobj_t *mobj)
// failure state: mobj is not facing tracer
// Reasaonable defaults: ANGLE_67h, ANGLE_292h
if (ang >= (UINT32)mobj->extravalue1 && ang <= ANGLE_MAX - (UINT32)mobj->extravalue1)
if (ang >= (angle_t)mobj->extravalue1 && ang <= ANGLE_MAX - (angle_t)mobj->extravalue1)
{
if (mobj->cvmem)
mobj->cvmem--;

2
src/p_spec.c
View File

@ -3761,7 +3761,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
case 457: // Track mobj angle to point
if (mo)
{
INT32 failureangle = min(max(abs(sides[line->sidenum[0]].textureoffset>>FRACBITS), 0), 360) * ANG1;
INT32 failureangle = FixedAngle((min(max(abs(sides[line->sidenum[0]].textureoffset>>FRACBITS), 0), 360))*FRACUNIT);
INT32 failuredelay = abs(sides[line->sidenum[0]].rowoffset>>FRACBITS);
INT32 failureexectag = line->sidenum[1] != 0xffff ?
(INT32)(sides[line->sidenum[1]].textureoffset>>FRACBITS) : 0;