stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-29 12:40:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

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 8f9595b72f
commit ff09a51915
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*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
1, // display offset
100, // mass
0, // damage
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;
break;
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);
return;
}
A_CapeChase(mobj);
P_TeleportMove(mobj, mobj->target->x, mobj->target->y, mobj->target->z);
break;
//}
case MT_TURRET: