OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into float

Browse source 
# Conflicts:
#	src/g_hexen/a_fighterplayer.cpp
This commit is contained in:
Christoph Oelckers 2016-03-16 22:45:55 +01:00
commit ec3be2531a
4 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/g_hexen/a_fighterplayer.cpp
View file

@ -27,7 +27,7 @@ static FRandom pr_fpatk ("FPunchAttack");
void AdjustPlayerAngle (AActor *pmo, FTranslatedLineTarget *t)
{
DAngle difference = deltaangle(pmo->Angles.Yaw, t->angleFromSource);
DAngle difference = deltaangle(pmo->Angles.Yaw, pmo->_f_AngleTo(t->linetarget););
if (fabs(difference) > MAX_ANGLE_ADJUST)
{
if (difference > 0)