]> git.lizzy.rs Git - minetest.git/commitdiff
Cap damage overlay duration to 1 second (#11871)
authorWuzzy <wuzzy2@mail.ru>
Mon, 3 Jan 2022 03:14:02 +0000 (03:14 +0000)
committerGitHub <noreply@github.com>
Mon, 3 Jan 2022 03:14:02 +0000 (22:14 -0500)
src/client/content_cao.cpp

index db01945eb565fa28e92e9a76e1df33ea7ea65150..9cc40c95fb95768aa4d9ee0555f731985d11ca55 100644 (file)
@@ -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);
                }
        }