From 06bbbb5cf87269911c1f9ef5003020b6f3424be5 Mon Sep 17 00:00:00 2001 From: lachwright Date: Wed, 23 Oct 2019 13:54:15 +0800 Subject: [PATCH] Put dashmode players in pain state when damaging enemy with >1HP --- src/p_inter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/p_inter.c b/src/p_inter.c index cce9df91b..b5b9ebbbf 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -477,6 +477,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) toucher->momy = -toucher->momy; if (player->charability == CA_FLY && player->panim == PA_ABILITY) 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); if (player->charability == CA_TWINSPIN && player->panim == PA_ABILITY)