From 48f2aa3da4c754292c08753860b66c56f2679659 Mon Sep 17 00:00:00 2001 From: "auria.mg" Date: Sun, 11 Mar 2018 19:35:59 -0400 Subject: [PATCH] Fix bubblegum flashing, fixes #3133 --- src/items/attachment.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/items/attachment.cpp b/src/items/attachment.cpp index 1db7f037a..855bd8167 100644 --- a/src/items/attachment.cpp +++ b/src/items/attachment.cpp @@ -504,20 +504,16 @@ void Attachment::update(float dt) int slow_flashes = stk_config->time2Ticks(3.0f); if (is_shield && m_ticks_left < slow_flashes) { - int flashes_per_second = 4; - int ticks_per_flash = stk_config->time2Ticks(0.25f); - + int ticks_per_flash = stk_config->time2Ticks(0.2f); + int fast_flashes = stk_config->time2Ticks(0.5f); if (m_ticks_left < fast_flashes) { - flashes_per_second = 12; - ticks_per_flash = stk_config->time2Ticks(1.0f/12); + ticks_per_flash = stk_config->time2Ticks(0.07f); } - //int divisor = 2; - //int mod = (int)(m_ticks_left * flashes_per_second * 2) % divisor; - int mod = m_ticks_left % ticks_per_flash; - m_node->setVisible(mod > ticks_per_flash); + int division = (m_ticks_left / ticks_per_flash); + m_node->setVisible((division & 0x1) == 0); } if (m_node_scale < m_wanted_node_scale)