oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Cap damage overlay duration to 1 second (#11871)

Browse source
This commit is contained in:
Wuzzy 2022-01-03 03:14:02 +00:00 • committed by GitHub
parent 835524654e
commit 84fdd369d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/client/content_cao.cpp
View file

@ -1859,6 +1859,8 @@ void GenericCAO::processMessage(const std::string &data)
m_reset_textures_timer = 0.05; m_reset_textures_timer = 0.05;
if(damage >= 2) if(damage >= 2)
m_reset_textures_timer += 0.05 * damage; 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); 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; m_reset_textures_timer = 0.05;
if (result.damage >= 2) if (result.damage >= 2)
m_reset_textures_timer += 0.05 * result.damage; 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); updateTextures(m_current_texture_modifier + m_prop.damage_texture_modifier);
} }
} }