From 8a428e69b6bcd4ec18832f4706866da224babf65 Mon Sep 17 00:00:00 2001
From: "Eevee (Alex Munroe)" <eevee.git@veekun.com>
Date: Sat, 6 Jun 2015 15:31:12 -0700
Subject: [PATCH] Don't play a terrain splash if the player didn't take damage.

---
 src/p_spec.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/p_spec.cpp b/src/p_spec.cpp
index 42a7b9ca4..5f29c3c53 100644
--- a/src/p_spec.cpp
+++ b/src/p_spec.cpp
@@ -738,12 +738,13 @@ void P_PlayerOnSpecialFlat (player_t *player, int floorType)
 			}
 		}
 
+		int damage = 0;
 		if (ironfeet == NULL)
 		{
-			P_DamageMobj (player->mo, NULL, NULL, Terrains[floorType].DamageAmount,
+			damage = P_DamageMobj (player->mo, NULL, NULL, Terrains[floorType].DamageAmount,
 				Terrains[floorType].DamageMOD);
 		}
-		if (Terrains[floorType].Splash != -1)
+		if (damage > 0 && Terrains[floorType].Splash != -1)
 		{
 			S_Sound (player->mo, CHAN_AUTO,
 				Splashes[Terrains[floorType].Splash].NormalSplashSound, 1,