diff options
Diffstat (limited to 'Stars45/ShipAI.cpp')
| -rw-r--r-- | Stars45/ShipAI.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Stars45/ShipAI.cpp b/Stars45/ShipAI.cpp index 0a7173e..c6362d3 100644 --- a/Stars45/ShipAI.cpp +++ b/Stars45/ShipAI.cpp @@ -103,7 +103,7 @@ ShipAI::ShipAI(SimObject* s) // +--------------------------------------------------------------------+ ShipAI::~ShipAI() -{ +{ delete tactical; } @@ -322,7 +322,7 @@ ShipAI::ExecFrame(double secs) engaged_ship_id = 0; /*** - *** XXX + *** XXX *** Not the right place to make this decision. *** *** There is a brief wait between killing a target and @@ -517,7 +517,7 @@ ShipAI::FindObjectiveTarget(SimObject* tgt) if (time < 15) { Point run_vec = tgt->Velocity(); obj_w = tgt->Location() + (run_vec * time); - + if (time < 10) obj_w += (tgt->Acceleration() * 0.33 * time * time); @@ -597,8 +597,8 @@ ShipAI::FindObjectiveNavPoint() 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 @@ -654,8 +654,8 @@ ShipAI::FindObjectiveQuantum() if (!self_rgn || !nav_rgn) return; - bool use_farcaster = self_rgn != nav_rgn && - (orders->Farcast() || + bool use_farcaster = self_rgn != nav_rgn && + (orders->Farcast() || !qdrive || !qdrive->IsPowerOn() || qdrive->Status() < System::DEGRADED @@ -822,8 +822,8 @@ ShipAI::FindObjectiveFormation() 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 @@ -910,7 +910,7 @@ ShipAI::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; @@ -921,7 +921,7 @@ ShipAI::Navigator() else if (rumor) ship->SetDirectorInfo(Game::GetText("ai.seek-rumor")); else - ship->SetDirectorInfo(Game::GetText("ai.none")); + ship->SetDirectorInfo(Game::GetText("ai.none")); Accumulate(AvoidCollision()); Accumulate(AvoidTerrain()); @@ -1319,7 +1319,7 @@ ShipAI::SeekTarget() if (distance < 2000) { result.brake = 1; } - + return result; } |