From 84fdd369d45314a5b7946ff66fe5fce85c1abc1f Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 3 Jan 2022 03:14:02 +0000 Subject: Cap damage overlay duration to 1 second (#11871) --- src/client/content_cao.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/client/content_cao.cpp') diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp index db01945eb..9cc40c95f 100644 --- a/src/client/content_cao.cpp +++ b/src/client/content_cao.cpp @@ -1859,6 +1859,8 @@ void GenericCAO::processMessage(const std::string &data) m_reset_textures_timer = 0.05; if(damage >= 2) m_reset_textures_timer += 0.05 * damage; + // Cap damage overlay to 1 second + m_reset_textures_timer = std::min(m_reset_textures_timer, 1.0f); updateTextures(m_current_texture_modifier + m_prop.damage_texture_modifier); } } @@ -1927,6 +1929,8 @@ bool GenericCAO::directReportPunch(v3f dir, const ItemStack *punchitem, m_reset_textures_timer = 0.05; if (result.damage >= 2) m_reset_textures_timer += 0.05 * result.damage; + // Cap damage overlay to 1 second + m_reset_textures_timer = std::min(m_reset_textures_timer, 1.0f); updateTextures(m_current_texture_modifier + m_prop.damage_texture_modifier); } } -- cgit v1.2.3