From 9d0b146470f23813c73d56a23c363b31812dd276 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Tue, 11 Oct 2022 17:53:30 +1100 Subject: [PATCH] - SW: Pitch-adjusted velocity for `InitSobjMachineGun()`. --- source/games/sw/src/weapon.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp index 37075e4ae..612030491 100644 --- a/source/games/sw/src/weapon.cpp +++ b/source/games/sw/src/weapon.cpp @@ -15992,6 +15992,7 @@ int InitSobjMachineGun(DSWActor* actor, PLAYER* pp) PlaySound(DIGI_BOATFIRE, pp, v3df_dontpan|v3df_doppler); auto npos = actor->spr.pos; + double dax = 1024.; double daz = npos.Z; if (RANDOM_P2(1024) < 200) @@ -16004,11 +16005,11 @@ int InitSobjMachineGun(DSWActor* actor, PLAYER* pp) } else { - daz = min(pp->horizon.horiz.Tan(), 0.1953125) * 1000 - RandomRangeF(80) + 40; + setFreeAimVelocity(dax, daz, DAngle::fromDeg(min(pp->horizon.horiz.Degrees(), 11.0515)), 1000 - RandomRangeF(80) + 40); daang = actor->spr.angle; } - FAFhitscan(npos, actor->sector(), DVector3(daang.ToVector() * 1024, daz), hit, CLIPMASK_MISSILE); + FAFhitscan(npos, actor->sector(), DVector3(daang.ToVector() * dax, daz), hit, CLIPMASK_MISSILE); if (hit.hitSector == nullptr) {