BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

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

Browse Source
This commit is contained in:
stujones11 2017-05-29 22:26:25 +01:00 committed by Loïc Blot
parent ef152428ef
commit 1681a009bc
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/content_cao.cpp
View File

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