From: stujones11 <stujones111@gmail.com>
Date: Mon, 29 May 2017 21:26:25 +0000 (+0100)
Subject: Don't add damage flash while punch texture modifier is active (#5767)
X-Git-Tag: 0.4.16~55
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1681a009bc54b19eeab0356c7ed856bc0bed6a1a;p=oweals%2Fminetest.git

Don't add damage flash while punch texture modifier is active (#5767)
---

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 5690ecf1e..d15c53e7a 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1735,7 +1735,7 @@ void GenericCAO::processMessage(const std::string &data)
 						m_smgr, m_env, m_position,
 						m_prop.visual_size * BS);
 				m_env->addSimpleObject(simple);
-			} else {
+			} else if (m_reset_textures_timer < 0) {
 				// TODO: Execute defined fast response
 				// Flashing shall suffice as there is no definition
 				m_reset_textures_timer = 0.05;
@@ -1806,10 +1806,12 @@ bool GenericCAO::directReportPunch(v3f dir, const ItemStack *punchitem,
 		}
 		// TODO: Execute defined fast response
 		// Flashing shall suffice as there is no definition
-		m_reset_textures_timer = 0.05;
-		if(result.damage >= 2)
-			m_reset_textures_timer += 0.05 * result.damage;
-		updateTextures(m_current_texture_modifier + "^[brighten");
+		if (m_reset_textures_timer < 0) {
+			m_reset_textures_timer = 0.05;
+			if (result.damage >= 2)
+				m_reset_textures_timer += 0.05 * result.damage;
+			updateTextures(m_current_texture_modifier + "^[brighten");
+		}
 	}
 
 	return false;