zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Don't autoaim backwards.

Browse source
This commit is contained in:
Christoph Oelckers 2021-05-16 19:20:36 +02:00
parent 88fe8e49a3
commit 395de23b21
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/games/exhumed/src/gun.cpp
View file

@ -815,16 +815,25 @@ loc_flag:
} }
case kWeaponPistol: case kWeaponPistol:
{ {
int var_50 = PlayerList[nLocalPlayer].horizon.horiz.asq16() >> 14; int h = PlayerList[nLocalPlayer].horizon.horiz.asq16() >> 14;
nHeight -= var_50; nHeight -= h;
int target = 0;
if (sPlayerInput[nPlayer].nTarget >= 0 && Autoaim(nPlayer)) if (sPlayerInput[nPlayer].nTarget >= 0 && Autoaim(nPlayer))
{ {
assert(sprite[sPlayerInput[nPlayer].nTarget].sectnum < kMaxSectors); assert(sprite[sPlayerInput[nPlayer].nTarget].sectnum < kMaxSectors);
var_50 = sPlayerInput[nPlayer].nTarget + 10000; int t = sPlayerInput[nPlayer].nTarget;
if (t >= 0 && t < MAXSPRITES)
{
// only autoaim if target is in front of the player.
auto pTargetSprite = &sprite[t];
int angletotarget = bvectangbam(pTargetSprite->x - sprite[nPlayerSprite].x, pTargetSprite->y - sprite[nPlayerSprite].y).asbuild();
int anglediff = (sprite[nPlayerSprite].ang - angletotarget) & 2047;
if (anglediff < 512 || anglediff > 1536) target = t + 10000;
}
} }
BuildBullet(nPlayerSprite, nAmmoType, ebp, ebx, nHeight, nAngle, var_50, var_1C); BuildBullet(nPlayerSprite, nAmmoType, ebp, ebx, nHeight, nAngle, target, var_1C);
break; break;
} }