diff --git a/src/p_inter.c b/src/p_inter.c index c1bcb5b8e..b6a864a0d 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2337,13 +2337,11 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da break; } - if (type != DMG_STING && type != DMG_STUMBLE) + if (type != DMG_STUMBLE) { - player->flashing = K_GetKartFlashing(player); - } + if (type != DMG_STING) + player->flashing = K_GetKartFlashing(player); - if (ringburst > 0) - { P_PlayRinglossSound(target); P_PlayerRingBurst(player, ringburst); } @@ -2356,7 +2354,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da } else { - K_DropHnextList(player, false); + K_DropHnextList(player, (type != DMG_STUMBLE)); } if (type != DMG_STUMBLE) diff --git a/src/p_setup.c b/src/p_setup.c index e10f18a29..7a9b8d03b 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -6017,7 +6017,9 @@ static void P_ConvertBinarySectorTypes(void) case 8: //Instakill sectors[i].damagetype = SD_INSTAKILL; break; - case 9: // Stumble + //case 9: -- Ring Drainer (Floor Touch) + //case 10: -- Ring Drainer (No Floor Touch) + case 11: // Stumble sectors[i].damagetype = SD_STUMBLE; break; case 12: //Wall sector