ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace hardcoded ticks value by time2ticks calls

Browse Source
This commit is contained in:
Alayan 2019-04-28 03:32:09 +02:00
parent a742d17fd1
commit 82d6d220d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modes/capture_the_flag.cpp
View File

@ -161,11 +161,11 @@ void CaptureTheFlag::updateGraphics(float dt)
m_blue_flag_indicator->setVisible(!m_blue_flag->isInBase()); m_blue_flag_indicator->setVisible(!m_blue_flag->isInBase());
core::stringw msg; core::stringw msg;
// Don't show flag has been returned message if there was scored event // Don't show flag has been returned message if
// happening recently // a point has been scored recently
const bool scored_recently = const bool scored_recently =
getTicksSinceStart() > m_last_captured_flag_ticks && getTicksSinceStart() > m_last_captured_flag_ticks &&
getTicksSinceStart() - m_last_captured_flag_ticks < 200; getTicksSinceStart() - m_last_captured_flag_ticks < stk_config->time2Ticks(2.0f);
if (m_red_flag_status != m_red_flag->getStatus()) if (m_red_flag_status != m_red_flag->getStatus())
{ {
if (m_red_flag->getHolder() != -1) if (m_red_flag->getHolder() != -1)
@ -215,7 +215,7 @@ void CaptureTheFlag::update(int ticks)
for (auto it = m_swatter_reset_kart_ticks.begin(); for (auto it = m_swatter_reset_kart_ticks.begin();
it != m_swatter_reset_kart_ticks.end();) it != m_swatter_reset_kart_ticks.end();)
{ {
if (it->second < getTicksSinceStart() - 1000) if (it->second < getTicksSinceStart() - stk_config->time2Ticks(8.0f))
{ {
it = m_swatter_reset_kart_ticks.erase(it); it = m_swatter_reset_kart_ticks.erase(it);
} }