diff options
Diffstat (limited to 'Stars45/StarshipAI.cpp')
| -rw-r--r-- | Stars45/StarshipAI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Stars45/StarshipAI.cpp b/Stars45/StarshipAI.cpp index 14af058..9cf24ca 100644 --- a/Stars45/StarshipAI.cpp +++ b/Stars45/StarshipAI.cpp @@ -120,8 +120,8 @@ StarshipAI::FindObjective() bool hold = order == RadioMessage::WEP_HOLD || order == RadioMessage::FORM_UP; - bool form = hold || - (!order && !target) || + bool form = hold || + (!order && !target) || (farcaster); // if not the element leader, stay in formation: @@ -243,7 +243,7 @@ StarshipAI::Navigator() magnitude = 0; hold = false; - if ((ship->GetElement() && ship->GetElement()->GetHoldTime() > 0) || + if ((ship->GetElement() && ship->GetElement()->GetHoldTime() > 0) || (navpt && navpt->Status() == Instruction::COMPLETE && navpt->HoldTime() > 0)) hold = true; @@ -502,8 +502,8 @@ StarshipAI::SeekTarget() navpt->SetRegion(nav_rgn); } - bool use_farcaster = self_rgn != nav_rgn && - (navpt->Farcast() || + bool use_farcaster = self_rgn != nav_rgn && + (navpt->Farcast() || !qdrive || !qdrive->IsPowerOn() || qdrive->Status() < System::DEGRADED @@ -641,7 +641,7 @@ StarshipAI::FireControl() Point delta = target->Location() - ship->Location(); double range = delta.length(); - if (range < weapon->GetDesign()->max_range * 0.9 && + if (range < weapon->GetDesign()->max_range * 0.9 && !AssessTargetPointDefense()) weapon->SetFiringOrders(Weapon::AUTO); |