zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified parts of InitShotgun

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-01 19:17:51 +02:00
parent ce3d44f3b6
commit b5f13c2a24
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
source/games/sw/src/weapon.cpp
View file

@ -12581,8 +12581,6 @@ int InitShotgun(PLAYER* pp)
short daang,ndaang, i;
HitInfo hit{};
int daz, ndaz;
int nx,ny,nz;
int xvect,yvect,zvect;
short cstat = 0;
PlayerUpdateAmmo(pp, actor->user.WeaponNum, -1);
@ -12601,9 +12599,8 @@ int InitShotgun(PLAYER* pp)
}
}
nx = pp->int_ppos().X;
ny = pp->int_ppos().Y;
daz = nz = pp->int_ppos().Z + pp->int_bob_z();
auto pos = pp->pos.plusZ(pp->bob_z);
daz = pos.Z * zworldtoint;
daang = 64;
if (WeaponAutoAimHitscan(pp->actor, &daz, &daang, false) != nullptr)
@ -12628,12 +12625,16 @@ int InitShotgun(PLAYER* pp)
ndaang = NORM_ANGLE(daang + (RandomRange(70) - 30));
}
xvect = bcos(ndaang);
yvect = bsin(ndaang);
zvect = ndaz;
FAFhitscan(nx, ny, nz, pp->cursector, // Start position
xvect, yvect, zvect,
hit, CLIPMASK_MISSILE);
DVector3 vect;
vect.XY() = DAngle::fromBuild(ndaang).ToVector() * 1024;
vect.Z = ndaz * zinttoworld;
FAFhitscan(pos, pp->cursector, vect, hit, CLIPMASK_MISSILE);
// still needed. Must go away later
int xvect = bcos(ndaang);
int yvect = bsin(ndaang);
int zvect = ndaz;
if (hit.hitSector == nullptr)
{