While it does not make a difference in this case, it should be &&, not &.

This commit is contained in:
hiker
2018-01-03 22:03:33 +11:00
parent 92426606c0
commit 8a25effa5c

View File

@@ -498,7 +498,7 @@ void Attachment::update(float dt)
bool is_shield = (m_type == ATTACH_BUBBLEGUM_SHIELD|| m_type == ATTACH_NOLOK_BUBBLEGUM_SHIELD);
float m_wanted_node_scale = is_shield ? std::max(1.0f, m_kart->getHighestPoint()*1.1f) : 1.0f;
int slow_flashes = 3;
if (is_shield & m_time_left < slow_flashes)
if (is_shield && m_time_left < slow_flashes)
{
int flashes_per_second = 4;
int divisor = 2;