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

A minor assortment of changes.

Browse source
This commit is contained in:
toasterbabe 2018-04-03 01:46:42 +01:00
parent 156cc031ea
commit 4f3f647f5b
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_inter.c
View file

@ -1503,10 +1503,10 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (player->powers[pw_flashing])
return;
if (special->movefactor && special->tracer && (angle_t)special->tracer->angle != ANGLE_90 && (angle_t)special->tracer->angle != ANGLE_270)
if (special->movefactor && special->tracer && special->tracer->angle != ANGLE_90 && special->tracer->angle != ANGLE_270)
{ // I don't expect you to understand this, Mr Bond...
angle_t ang = R_PointToAngle2(special->x, special->y, toucher->x, toucher->y) - special->tracer->threshold;
if ((special->movefactor > 0) == ((angle_t)special->tracer->angle > ANGLE_90 && (angle_t)special->tracer->angle < ANGLE_270))
angle_t ang = R_PointToAngle2(special->x, special->y, toucher->x, toucher->y) - special->tracer->angle;
if ((special->movefactor > 0) == (special->tracer->angle > ANGLE_90 && special->tracer->angle < ANGLE_270))
ang += ANGLE_180;
if (ang < ANGLE_180)
return; // I expect you to die.

9
src/p_mobj.c
View file

@ -9959,6 +9959,8 @@ ML_EFFECT4 : Don't clip inside the ground
else
radiusfactor = (((linktype = chainlink) == MT_NULL) ? 2 : 1);
widthfactor = ((firsttype == chainlink) ? 1 : 2);
mflagsapply = ((lines[line].flags & ML_EFFECT4) ? 0 : (MF_NOCLIP|MF_NOCLIPHEIGHT));
mflags2apply = ((mthing->options & MTF_OBJECTFLIP) ? MF2_OBJECTFLIP : 0);
meflagsapply = ((mthing->options & MTF_OBJECTFLIP) ? MFE_VERTICALFLIP : 0);
@ -10004,7 +10006,7 @@ ML_EFFECT4 : Don't clip inside the ground
firsttype = linktype = chainlink;
mmaxlength = 1 + (mlength - 1)*radiusfactor;
radiusfactor = 1;
radiusfactor = widthfactor = 1;
}
else
{
@ -10023,21 +10025,18 @@ ML_EFFECT4 : Don't clip inside the ground
}
firsttype = macetype;
widthfactor = 2;
}
mmaxlength = mlength;
}
widthfactor = ((firsttype == chainlink) ? 1 : 2);
mwidthset = mwidth;
//fixed_t base = 0;
mlengthset = mminlength;
if (mdocenter) // Innermost mace/link
makemace(macetype, 0, 0);
//base = mlengthset*((mobjinfo[macetype].speed) ? mobjinfo[macetype].speed : mobjinfo[MT_SMALLMACECHAIN].speed);
// Out from the center...
if (linktype)
{