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

Merge branch 'fix-gravflip-shields' into 'master'

Browse source 
Fix Thunder/Flame shield in gravity flip (resolves #754)

Closes #754

See merge request KartKrew/Kart!1609
This commit is contained in:
Oni 2023-11-17 08:25:59 +00:00
commit 3a36263296
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/info.c
View file

@ -24786,7 +24786,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // deathsound sfx_None, // deathsound
8, // speed 8, // speed
28*FRACUNIT, // radius 28*FRACUNIT, // radius
56*FRACUNIT, // height 0*FRACUNIT, // height
1, // display offset 1, // display offset
16, // mass 16, // mass
0, // damage 0, // damage
@ -24840,7 +24840,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // deathsound sfx_None, // deathsound
8, // speed 8, // speed
28*FRACUNIT, // radius 28*FRACUNIT, // radius
56*FRACUNIT, // height 0*FRACUNIT, // height
1, // display offset 1, // display offset
16, // mass 16, // mass
0, // damage 0, // damage
@ -24867,7 +24867,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
8<<FRACBITS, // radius 8<<FRACBITS, // radius
16<<FRACBITS, // height 0<<FRACBITS, // height
-1, // display offset -1, // display offset
100, // mass 100, // mass
0, // damage 0, // damage
@ -24894,7 +24894,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
8<<FRACBITS, // radius 8<<FRACBITS, // radius
16<<FRACBITS, // height 0<<FRACBITS, // height
1, // display offset 1, // display offset
100, // mass 100, // mass
0, // damage 0, // damage

4
src/p_mobj.c
View file

@ -8796,9 +8796,11 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
} }
} }
P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z + mobj->target->height/2); P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z + (mobj->eflags & MFE_VERTICALFLIP ? 1 : 1) * mobj->target->height/2);
mobj->angle = K_MomentumAngle(mobj->target); mobj->angle = K_MomentumAngle(mobj->target);
K_FlipFromObject(mobj, mobj->target);
if (underlayst != S_NULL) if (underlayst != S_NULL)
{ {
mobj_t *underlay = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_FLAMESHIELDUNDERLAY); mobj_t *underlay = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_FLAMESHIELDUNDERLAY);