OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: FTranslatedLineTarget::angleFromSource returned the attack angle, not the angle between actors when returned from P_LineAttack.

Browse source 
For most attack functions this is wrong, it's only the Hexen fighter attack needing this particular value, so it has been split up into two return values now.
This commit is contained in:
Christoph Oelckers 2016-12-06 11:04:54 +01:00
commit b2d1b0d7a6
7 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/p_map.cpp
View file

@ -3588,6 +3588,7 @@ struct aim_t
res.linetarget = th;
res.pitch = pitch;
res.angleFromSource = (th->Pos() - startpos).Angle();
res.attackAngleFromSource = res.angleFromSource; // at this point we do not have an attack angle so it's the same as the actual angle between actors.
res.unlinked = unlinked;
res.frac = frac;
}
@ -4506,7 +4507,9 @@ AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
if (victim != NULL)
{
victim->linetarget = trace.Actor;
victim->angleFromSource = trace.SrcAngleFromTarget;
victim->attackAngleFromSource = trace.SrcAngleFromTarget;
// With arbitrary portals this cannot be calculated so using the actual attack angle is the only option.
victim->angleFromSource = trace.unlinked? victim->attackAngleFromSource : t1->AngleTo(trace.Actor);
victim->unlinked = trace.unlinked;
}
}