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

- RR: Pitch-adjusted velocity for shootmelee() when free-aiming.

Browse source
This commit is contained in:
Mitchell Richters 2022-10-11 14:34:30 +11:00
parent 24dcd26e64
commit b14525b47b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/duke/src/player_r.cpp
View file

@ -86,12 +86,12 @@ void incur_damage_r(player_struct* p)
static void shootmelee(DDukeActor *actor, int p, DVector3 pos, DAngle ang, int atwith) static void shootmelee(DDukeActor *actor, int p, DVector3 pos, DAngle ang, int atwith)
{ {
auto sectp = actor->sector(); auto sectp = actor->sector();
double zvel; double vel = 1024., zvel;
HitInfo hit{}; HitInfo hit{};
if (p >= 0) if (p >= 0)
{ {
zvel = ps[p].horizon.sum().Tan() * 16.; setFreeAimVelocity(vel, zvel, ps[p].horizon.sum(), 16.);
pos.Z += 6; pos.Z += 6;
ang += DAngle1 * 2.64; ang += DAngle1 * 2.64;
} }
@ -103,7 +103,7 @@ static void shootmelee(DDukeActor *actor, int p, DVector3 pos, DAngle ang, int a
ang = (pactor->spr.pos.XY() - pos.XY()).Angle(); ang = (pactor->spr.pos.XY() - pos.XY()).Angle();
} }
hitscan(pos, sectp, DVector3(ang.ToVector() * 1024, zvel * 64), hit, CLIPMASK1); hitscan(pos, sectp, DVector3(ang.ToVector() * vel, zvel * 64), hit, CLIPMASK1);
if (isRRRA() && hit.hitSector != nullptr && ((hit.hitSector->lotag == 160 && zvel > 0) || (hit.hitSector->lotag == 161 && zvel < 0)) if (isRRRA() && hit.hitSector != nullptr && ((hit.hitSector->lotag == 160 && zvel > 0) || (hit.hitSector->lotag == 161 && zvel < 0))
&& hit.actor() == nullptr && hit.hitWall == nullptr) && hit.actor() == nullptr && hit.hitWall == nullptr)