mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-24 04:51:19 +00:00
Fixed wrong angle/slopes being used and one too many &s for NOINTERACT.
This commit is contained in:
parent
10fabc3ab7
commit
02064437c5
2 changed files with 3 additions and 3 deletions
|
@ -4096,7 +4096,7 @@ static ETraceStatus CheckForActor(FTraceResults &res, void *userdata)
|
|||
AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
|
||||
DAngle pitch, int damage, FName damageType, PClassActor *pufftype, int flags, FTranslatedLineTarget*victim, int *actualdamage)
|
||||
{
|
||||
bool nointeract = !!(flags && LAF_NOINTERACT);
|
||||
bool nointeract = !!(flags & LAF_NOINTERACT);
|
||||
DVector3 direction;
|
||||
double shootz;
|
||||
FTraceResults trace;
|
||||
|
|
|
@ -1690,7 +1690,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CustomBulletAttack)
|
|||
if (!puff)
|
||||
{
|
||||
temp = true;
|
||||
puff = P_LineAttack(self, bangle, range, bslope, 0, NAME_Hitscan, pufftype, laflags | LAF_NOINTERACT);
|
||||
puff = P_LineAttack(self, angle, range, slope, 0, NAME_Hitscan, pufftype, laflags | LAF_NOINTERACT);
|
||||
}
|
||||
|
||||
if (puff && missile)
|
||||
|
@ -1970,7 +1970,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_FireBullets)
|
|||
if (!puff)
|
||||
{
|
||||
temp = true;
|
||||
puff = P_LineAttack(self, bangle, range, bslope, 0, NAME_Hitscan, pufftype, laflags | LAF_NOINTERACT);
|
||||
puff = P_LineAttack(self, angle, range, slope, 0, NAME_Hitscan, pufftype, laflags | LAF_NOINTERACT);
|
||||
}
|
||||
FireBulletMissile(self, missile, puff, angle, Spawnheight, Spawnofs_xy, flags, temp);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue