zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified WeaponHitscanShootFeet

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-31 21:46:33 +02:00
parent 12d182db6d
commit bd54c4e8e2
1 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12314,7 +12314,7 @@ DSWActor* WeaponAutoAimHitscan(DSWActor* actor, int *z, short *ang, bool test)
if (dist != 0)
{
zh = int_ActorZOfTop(picked) + (int_ActorSizeZ(picked) >> 2);
zh = (ActorZOfTop(picked) + (ActorSizeZ(picked) * 0.5)) * zworldtoint;
xvect = bcos(*ang);
yvect = bsin(*ang);
@ -12331,34 +12331,24 @@ DSWActor* WeaponAutoAimHitscan(DSWActor* actor, int *z, short *ang, bool test)
return picked;
}
void WeaponHitscanShootFeet(DSWActor* actor, DSWActor* hitActor, int *zvect)
void WeaponHitscanShootFeet(DSWActor* actor, DSWActor* hitActor, double *zvect)
{
int dist;
int zh;
int xvect;
int yvect;
int z;
short ang;
ang = NORM_ANGLE(getangle(hitActor->int_pos().X - actor->int_pos().X, hitActor->int_pos().Y - actor->int_pos().Y));
auto delta = hitActor->spr.pos.XY() - actor->spr.pos.XY();
DAngle ang = VecToAngle(delta);
// find the distance to the target
dist = int((actor->spr.pos.XY() - hitActor->spr.pos.XY()).Length() * worldtoint);
double dist = delta.Length();
if (dist != 0)
{
zh = int_ActorZOfBottom(hitActor) + Z(20);
z = actor->int_pos().Z;
double zh = ActorZOfBottom(hitActor) + 20;
double z = actor->spr.pos.Z;
auto vect = ang.ToVector() * 1024;
xvect = bcos(ang);
yvect = bsin(ang);
if (hitActor->int_pos().X - actor->int_pos().X != 0)
//*z = xvect * ((zh - *z)/(hitActor->int_pos().X - actor->int_pos().X));
*zvect = Scale(xvect,zh - z, hitActor->int_pos().X - actor->int_pos().X);
else if (hitActor->int_pos().Y - actor->int_pos().Y != 0)
//*z = yvect * ((zh - *z)/(hitActor->int_pos().Y - actor->int_pos().Y));
*zvect = Scale(yvect,zh - z, hitActor->int_pos().Y - actor->int_pos().Y);
if (delta.X != 0)
*zvect = vect.X * (zh - z) / delta.X;
else if (delta.Y != 0)
*zvect = vect.Y * (zh - z) / delta.Y;
else
*zvect = 0;
}
@ -15614,7 +15604,9 @@ int InitTurretMgun(SECTOR_OBJECT* sop)
{
// always shoot the ground when tracking
// and not close
WeaponHitscanShootFeet(actor, hitt, &daz);
double fdaz = daz * zinttoworld;
WeaponHitscanShootFeet(actor, hitt, &fdaz);
daz = fdaz * zworldtoint;
daang = actor->int_ang();
daang = NORM_ANGLE(daang + RANDOM_P2(32) - 16);