This commit is contained in:
Alug committed 2024-10-28 07:38:43 +01:00
1 parent b83016f492
commit 588e52a673
1 file changed
+37 -46
+37 -46
View File
@@ -2817,16 +2817,9 @@ void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32
TVector v;
TVector *res;
fixed_t finalx, finaly, finalz, dist;
//mobj_t hoopcenter;
angle_t degrees, fa, closestangle;
fixed_t mobjx, mobjy, mobjz;
//hoopcenter.x = x;
//hoopcenter.y = y;
//hoopcenter.z = z;
//hoopcenter.z = z - mobjinfo[type].height/2;
degrees = FINEANGLES/number;
closestangle = 0;
@@ -3212,17 +3205,19 @@ static void K_SpawnAIZDust(player_t *player)
static void K_StretchPlayerGravity(player_t *p)
{
fixed_t mos = FRACUNIT;
fixed_t rzs = abs(p->mo->momz);
fixed_t zspd = abs(rzs/mos);
I_Assert(p != NULL);
I_Assert(p->mo != NULL);
I_Assert(!P_MobjWasRemoved(p->mo));
fixed_t mos = FRACUNIT;
fixed_t rzs = abs(p->mo->momz);
fixed_t zspd = abs(rzs/mos);
fixed_t stretchScaleFactor = 0;
fixed_t rzsDiv = 1;
fixed_t slamDiv = 1;
fixed_t dxs = p->mo->realxscale;
fixed_t dys = p->mo->realyscale;
//boolean gravSlamming = false;
//fixed_t impactFactor = 0;
fixed_t dxs = p->mo->realxscale;
fixed_t dys = p->mo->realyscale;
stretchScaleFactor = FixedDiv(FRACUNIT*60, cv_gravstretch.value);
if (stretchScaleFactor > 17476977)
@@ -3232,10 +3227,6 @@ static void K_StretchPlayerGravity(player_t *p)
//CONS_Printf(M_GetText("div: %d, scale factor: %d, stretch value: %d\n"), rzsDiv, stretchScaleFactor, cv_gravstretch.value);
I_Assert(p != NULL);
I_Assert(p->mo != NULL);
I_Assert(!P_MobjWasRemoved(p->mo));
if (p->mo->slamsoundtimer)
p->mo->slamsoundtimer--;
@@ -3245,40 +3236,40 @@ static void K_StretchPlayerGravity(player_t *p)
p->mo->slamsoundtimer = TICRATE;
}
if (!P_IsObjectOnGround(p->mo))
{
if (zspd != 0)
{
if (((dxs-(rzsDiv))) > (dxs/5))
{
p->mo->spritexscale = ((dxs-(rzsDiv)));
p->mo->stretchslam = rzs;
}
else
p->mo->spritexscale = (dxs/5);
if (!P_IsObjectOnGround(p->mo))
{
if (zspd != 0)
{
if (((dxs-(rzsDiv))) > (dxs/5))
{
p->mo->spritexscale = ((dxs-(rzsDiv)));
p->mo->stretchslam = rzs;
}
else
p->mo->spritexscale = (dxs/5);
p->mo->spriteyscale = (dys+((rzsDiv*2)/3));
}
else
{
p->mo->spritexscale = (dxs);
p->mo->spriteyscale = (dys);
}
}
else
{
p->mo->spriteyscale = (dys+((rzsDiv*2)/3));
}
else
{
p->mo->spritexscale = (dxs);
p->mo->spriteyscale = (dys);
}
}
else
{
if (stretchScaleFactor > 17476977)
slamDiv = 0;
else
slamDiv = FixedDiv(p->mo->stretchslam, stretchScaleFactor);
p->mo->spritexscale = (dxs+(((slamDiv*2)/3)*2));
p->mo->spriteyscale = (dys-(slamDiv));
if (p->mo->stretchslam > 0)
p->mo->stretchslam -= (4*mos);
else
p->mo->stretchslam = 0;
}
p->mo->spritexscale = (dxs+(((slamDiv*2)/3)*2));
p->mo->spriteyscale = (dys-(slamDiv));
if (p->mo->stretchslam > 0)
p->mo->stretchslam -= (4*mos);
else
p->mo->stretchslam = 0;
}
}
static void K_QuiteSaltyHop(player_t *p)