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

Fix invincibility white flash

Browse source 
Calls P_TeleportMove instead of A_CapeChase, object was given a dispoffset
This commit is contained in:
TehRealSalt 2018-06-13 22:24:31 -04:00
parent 103ad41994
commit a303ccfacb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -14365,7 +14365,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8, // speed 8, // speed
8*FRACUNIT, // radius 8*FRACUNIT, // radius
8*FRACUNIT, // height 8*FRACUNIT, // height
0, // display offset 1, // display offset
100, // mass 100, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound

4
src/p_mobj.c
View file

@ -8134,12 +8134,12 @@ void P_MobjThinker(mobj_t *mobj)
mobj->colorized = mobj->target->colorized; mobj->colorized = mobj->target->colorized;
break; break;
case MT_INVULNFLASH: case MT_INVULNFLASH:
if (!mobj->target || (mobj->target->player && !mobj->target->player->kartstuff[k_invincibilitytimer])) if (!mobj->target || !mobj->target->health || (mobj->target->player && !mobj->target->player->kartstuff[k_invincibilitytimer]))
{ {
P_RemoveMobj(mobj); P_RemoveMobj(mobj);
return; return;
} }
A_CapeChase(mobj); P_TeleportMove(mobj, mobj->target->x, mobj->target->y, mobj->target->z);
break; break;
//} //}
case MT_TURRET: case MT_TURRET: