teambeef/questzdoom
0
0
Fork 0
mirror of https://github.com/DrBeef/QuestZDoom.git synced 2025-03-04 08:31:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix strange aiming issue

Browse source
This commit is contained in:
Simon 2020-05-31 22:55:39 +01:00
parent f47f9593f8
commit af67930294
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_map.cpp
View file

@ -4547,7 +4547,16 @@ AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
//Include pitch delta here //Include pitch delta here
DAngle pitchDelta; DAngle pitchDelta;
pitchDelta = (t1->player->mo->Angles.Pitch - pitch); pitchDelta = (t1->Angles.Pitch - pitch);
if (damage == 0 ||
//This is the catch the scenario is vanilla Doom (or suchlike) where a.BulletSlope is calculating a completely
//different pitch, if we are outside a tolerance of +/- 5 degrees, then just use the pitch of the
//controller as we did before. This still allows a nice random scattering of projectiles from a shell
fabs(pitchDelta.Degrees) > 5.f)
{
pitchDelta.Degrees = 0;
}
direction = t1->player->mo->AttackDir(t1, angle, pitchDelta); direction = t1->player->mo->AttackDir(t1, angle, pitchDelta);
} }
else if (flags & LAF_ABSPOSITION) else if (flags & LAF_ABSPOSITION)

5
Projects/Android/jni/gzdoom-g3.3mgw_mobile/src/p_user.cpp
View file

@ -1744,6 +1744,11 @@ bool P_IsPlayerTotallyFrozen(const player_t *player)
// //
//========================================================================== //==========================================================================
DEFINE_FIELD(AActor, OverrideAttackPosDir);
DEFINE_FIELD(AActor, AttackPos);
DEFINE_FIELD(AActor, AttackDir);
DEFINE_FIELD_X(PlayerInfo, player_t, mo) DEFINE_FIELD_X(PlayerInfo, player_t, mo)
DEFINE_FIELD_X(PlayerInfo, player_t, playerstate) DEFINE_FIELD_X(PlayerInfo, player_t, playerstate)
DEFINE_FIELD_X(PlayerInfo, player_t, original_oldbuttons) DEFINE_FIELD_X(PlayerInfo, player_t, original_oldbuttons)