Skip to content

Commit 75fe1b2

Browse files
committed
small dogfight fix
1 parent 8f64f70 commit 75fe1b2

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

‎src/Geoscape/DogfightState.cpp‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -731,23 +731,24 @@ void DogfightState::update()
731731
if (!_minimized)
732732
{
733733
animate();
734-
int escapeCounter = _ufo->getEscapeCountdown();
735-
if (!_ufo->isCrashed() && !_ufo->isDestroyed() && !_craft->isDestroyed())
734+
if (!_ufo->isCrashed() && !_ufo->isDestroyed() && !_craft->isDestroyed() && !_ufo->getInterceptionProcessed())
736735
{
737-
if (escapeCounter > 0 && !_ufo->getInterceptionProcessed())
736+
_ufo->setInterceptionProcessed(true);
737+
int escapeCounter = _ufo->getEscapeCountdown();
738+
739+
if (escapeCounter > 0 )
738740
{
739741
escapeCounter--;
740742
_ufo->setEscapeCountdown(escapeCounter);
741-
_ufo->setInterceptionProcessed(true);
742-
if (_ufo->getFireCountdown() > 0)
743+
// Check if UFO is breaking off.
744+
if (escapeCounter == 0)
743745
{
744-
_ufo->setFireCountdown(_ufo->getFireCountdown() - 1);
746+
_ufo->setSpeed(_ufo->getRules()->getMaxSpeed());
745747
}
746748
}
747-
// Check if UFO is breaking off.
748-
if (escapeCounter == 0)
749+
if (_ufo->getFireCountdown() > 0)
749750
{
750-
_ufo->setSpeed(_ufo->getRules()->getMaxSpeed());
751+
_ufo->setFireCountdown(_ufo->getFireCountdown() - 1);
751752
}
752753
}
753754
}

0 commit comments

Comments
 (0)