diff --git a/src/deh_tables.c b/src/deh_tables.c index a36b7af9d..ab0ef138b 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -6369,6 +6369,7 @@ struct int_const_s const INT_CONST[] = { {"DMG_TUMBLE",DMG_TUMBLE}, {"DMG_STING",DMG_STING}, {"DMG_KARMA",DMG_KARMA}, + {"DMG_VOLTAGE",DMG_VOLTAGE}, //// Death types {"DMG_INSTAKILL",DMG_INSTAKILL}, {"DMG_DEATHPIT",DMG_DEATHPIT}, diff --git a/src/k_collide.c b/src/k_collide.c index 6a67e5a04..dac44b5f7 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -625,7 +625,7 @@ static inline BlockItReturn_t PIT_LightningShieldAttack(mobj_t *thing) } #endif - P_DamageMobj(thing, lightningSource, lightningSource, 1, DMG_NORMAL|DMG_CANTHURTSELF|DMG_WOMBO); + P_DamageMobj(thing, lightningSource, lightningSource, 1, DMG_VOLTAGE|DMG_CANTHURTSELF|DMG_WOMBO); return BMIT_CONTINUE; } diff --git a/src/p_inter.c b/src/p_inter.c index e77a5d8ff..76757f193 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2180,6 +2180,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da K_SpinPlayer(player, inflictor, source, KSPIN_WIPEOUT); K_KartPainEnergyFling(player); break; + case DMG_VOLTAGE: case DMG_NORMAL: default: K_SpinPlayer(player, inflictor, source, KSPIN_SPINOUT); diff --git a/src/p_local.h b/src/p_local.h index e547bc7b4..d9486e8b7 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -516,6 +516,7 @@ struct BasicFF_t #define DMG_TUMBLE 0x03 #define DMG_STING 0x04 #define DMG_KARMA 0x05 // Karma Bomb explosion -- works like DMG_EXPLODE, but steals half of their bumpers & deletes the rest +#define DMG_VOLTAGE 0x06 //// Death types - cannot be combined with damage types #define DMG_INSTAKILL 0x80 #define DMG_DEATHPIT 0x81