thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-26 13:01:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix duel bomb direction not working

Browse source
This commit is contained in:
Sally Coolatta 2022-09-28 03:07:46 -04:00
parent 70a231f115
commit 4549ec5334
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/p_mobj.c
View file

@ -1703,7 +1703,13 @@ void P_XYMovement(mobj_t *mo)
if (walltransferred == false)
{
if (mo->flags & MF_SLIDEME)
if (mo->type == MT_DUELBOMB)
{
P_SpawnMobjFromMobj(mo, 0, 0, 0, MT_BUMP);
Obj_DuelBombReverse(mo);
xmove = ymove = 0;
}
else if (mo->flags & MF_SLIDEME)
{
P_SlideMove(mo);
if (P_MobjWasRemoved(mo))
@ -1759,10 +1765,6 @@ void P_XYMovement(mobj_t *mo)
S_StartSound(mo, sfx_s3k44); // Bubble bounce
break;
case MT_DUELBOMB:
Obj_DuelBombReverse(mo);
break;
default:
break;
}
@ -10329,9 +10331,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
// Remove before release
CONS_Alert(CONS_WARNING, "Boss waypoints are deprecated. Did you forget to remove the old checkpoints, too?\n");
break;
case MT_DUELBOMB:
Obj_DuelBombInit(mobj);
break;
default:
break;
}
@ -12752,6 +12751,14 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
maptargets++;
break;
}
case MT_DUELBOMB:
{
// Duel Bomb needs init to match real map thing's angle
mobj->angle = FixedAngle(mthing->angle << FRACBITS);
Obj_DuelBombInit(mobj);
*doangle = false;
break;
}
case MT_BANANA:
{
// Give Duel bananas a random angle