thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-down-slope-missiles' into 'master'

Browse source 
Fix missile items fired while on downward slope or stairs

Closes #595

See merge request KartKrew/Kart!1392
This commit is contained in:
Oni 2023-08-13 14:55:15 +00:00
commit 482a7a6ef5
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/k_kart.c
View file

@ -4745,7 +4745,7 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, I
x = source->x + source->momx + FixedMul(finalspeed, FINECOSINE(an>>ANGLETOFINESHIFT)); x = source->x + source->momx + FixedMul(finalspeed, FINECOSINE(an>>ANGLETOFINESHIFT));
y = source->y + source->momy + FixedMul(finalspeed, FINESINE(an>>ANGLETOFINESHIFT)); y = source->y + source->momy + FixedMul(finalspeed, FINESINE(an>>ANGLETOFINESHIFT));
z = source->z; // spawn on the ground please z = P_GetZAt(source->standingslope, x, y, source->z); // spawn on the ground please
th = P_SpawnMobj(x, y, z, type); // this will never return null because collision isn't processed here th = P_SpawnMobj(x, y, z, type); // this will never return null because collision isn't processed here
@ -4768,14 +4768,15 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, I
th->momy = FixedMul(finalspeed, FINESINE(an>>ANGLETOFINESHIFT)); th->momy = FixedMul(finalspeed, FINESINE(an>>ANGLETOFINESHIFT));
th->momz = source->momz; th->momz = source->momz;
P_CheckPosition(th, x, y, NULL); // Get floorz and ceilingz
P_SetOrigin(th, x, y, z);
if (P_MobjWasRemoved(th)) if (P_MobjWasRemoved(th))
return NULL; return NULL;
if ((P_IsObjectFlipped(th) if ((P_IsObjectFlipped(th)
? tm.ceilingz - source->ceilingz ? th->ceilingz - source->ceilingz
: tm.floorz - source->floorz) > P_GetThingStepUp(th, x, y)) : th->floorz - source->floorz) > P_GetThingStepUp(th, x, y))
{ {
// Assuming this is on the boundary of a sector and // Assuming this is on the boundary of a sector and
// the wall is too tall... I'm not bothering with // the wall is too tall... I'm not bothering with
@ -4785,12 +4786,36 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, I
const fixed_t r = abs(th->radius - source->radius); const fixed_t r = abs(th->radius - source->radius);
P_SetOrigin(th, source->x - FixedMul(r, FSIN(an)), source->y - FixedMul(r, FCOS(an)), z); x = source->x - FixedMul(r, FSIN(an));
y = source->y - FixedMul(r, FCOS(an));
z = P_GetZAt(source->standingslope, x, y, source->z);
P_SetOrigin(th, x, y, z);
if (P_MobjWasRemoved(th)) if (P_MobjWasRemoved(th))
return NULL; return NULL;
} }
if (P_IsObjectOnGround(source))
{
// If the player is on the ground, make sure the
// missile spawns on the ground, so it smoothly
// travels down stairs.
// FIXME: This needs a more elegant solution because
// if multiple stairs are crossed, the height
// difference in the end is too great (this affects
// slopes too).
const fixed_t tz = P_IsObjectFlipped(th) ? th->ceilingz - th->height : th->floorz;
if (abs(tz - z) <= P_GetThingStepUp(th, x, y))
{
z = tz;
th->z = z;
}
}
if (source->player != NULL) if (source->player != NULL)
{ {
th->cusval = source->player->itemscale; th->cusval = source->player->itemscale;