thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-31 12:13:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

K_PuntMine: Same MF_NOCLIP change regression fix

Browse source
This commit is contained in:
toaster 2023-03-01 19:03:51 +00:00
parent 4e9d2295c9
commit ac086fe09a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_kart.c
View file

@ -5625,7 +5625,7 @@ void K_PuntMine(mobj_t *origMine, mobj_t *punter)
spd = FixedMul(82 * punter->scale, K_GetKartGameSpeedScalar(gamespeed)); // Avg Speed is 41 in Normal
mine->flags |= MF_NOCLIPTHING;
mine->flags |= (MF_NOCLIP|MF_NOCLIPTHING);
P_SetMobjState(mine, S_SSMINE_AIR1);
mine->threshold = 10;
@ -5637,7 +5637,7 @@ void K_PuntMine(mobj_t *origMine, mobj_t *punter)
//K_SetHitLagForObjects(punter, mine, 5);
mine->flags &= ~MF_NOCLIPTHING;
mine->flags &= ~(MF_NOCLIP|MF_NOCLIPTHING);
}
#define THUNDERRADIUS 320
@ -6150,11 +6150,11 @@ void K_DropHnextList(player_t *player, boolean keepshields)
{
fixed_t radius = FixedMul(work->info->radius, dropwork->destscale);
radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(radius, radius); // mobj's distance from its Target, or Radius.
dropwork->flags |= MF_NOCLIPTHING;
dropwork->flags |= (MF_NOCLIP|MF_NOCLIPTHING);
work->momx = FixedMul(FINECOSINE(work->angle>>ANGLETOFINESHIFT), radius);
work->momy = FixedMul(FINESINE(work->angle>>ANGLETOFINESHIFT), radius);
P_MoveOrigin(dropwork, player->mo->x + work->momx, player->mo->y + work->momy, player->mo->z);
dropwork->flags &= ~MF_NOCLIPTHING;
dropwork->flags &= ~(MF_NOCLIP|MF_NOCLIPTHING);
}
dropwork->flags2 |= MF2_AMBUSH;