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

Fix #3883

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

2
src/modes/capture_the_flag.cpp
View File

@ -248,7 +248,6 @@ void CaptureTheFlag::update(int ticks)
m_blue_flag->update(ticks); m_blue_flag->update(ticks);
if (m_red_flag->getHolder() != -1 && m_blue_flag->isInBase() && if (m_red_flag->getHolder() != -1 && m_blue_flag->isInBase() &&
m_blue_flag->isActivated() &&
(m_blue_flag->getBaseOrigin() - m_red_flag->getOrigin()).length() < (m_blue_flag->getBaseOrigin() - m_red_flag->getOrigin()).length() <
g_capture_length) g_capture_length)
{ {
@ -279,7 +278,6 @@ void CaptureTheFlag::update(int ticks)
m_red_flag->resetToBase(race_manager->getFlagDeactivatedTicks()); m_red_flag->resetToBase(race_manager->getFlagDeactivatedTicks());
} }
else if (m_blue_flag->getHolder() != -1 && m_red_flag->isInBase() && else if (m_blue_flag->getHolder() != -1 && m_red_flag->isInBase() &&
m_red_flag->isActivated() &&
(m_red_flag->getBaseOrigin() - m_blue_flag->getOrigin()).length() < (m_red_flag->getBaseOrigin() - m_blue_flag->getOrigin()).length() <
g_capture_length) g_capture_length)
{ {