Put dashmode players in pain state when damaging enemy with >1HP
This commit is contained in:
parent
7be046e16c
commit
06bbbb5cf8
|
@ -477,6 +477,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
||||||
toucher->momy = -toucher->momy;
|
toucher->momy = -toucher->momy;
|
||||||
if (player->charability == CA_FLY && player->panim == PA_ABILITY)
|
if (player->charability == CA_FLY && player->panim == PA_ABILITY)
|
||||||
toucher->momz = -toucher->momz/2;
|
toucher->momz = -toucher->momz/2;
|
||||||
|
if (player->dashmode >= DASHMODE_THRESHOLD && (player->charflags & (SF_DASHMODE|SF_MACHINE)) == (SF_DASHMODE|SF_MACHINE)
|
||||||
|
&& player->panim == PA_DASH)
|
||||||
|
P_DoPlayerPain(player, special, special);
|
||||||
}
|
}
|
||||||
P_DamageMobj(special, toucher, toucher, 1, 0);
|
P_DamageMobj(special, toucher, toucher, 1, 0);
|
||||||
if (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY)
|
if (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY)
|
||||||
|
|
Loading…
Reference in New Issue