From 85f318323287e8022c67069a55da959a7a5b0435 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Sun, 17 Jan 2021 19:13:42 +0000
Subject: [PATCH] Fix Shuttle AI scenario
---
src/AIModel/AIBase.cxx | 3 ---
src/AIModel/AIStatic.cxx | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/AIModel/AIBase.cxx b/src/AIModel/AIBase.cxx
index c4d16ebcd..1bbe1d7e8 100644
--- a/src/AIModel/AIBase.cxx
+++ b/src/AIModel/AIBase.cxx
@@ -252,9 +252,6 @@ void FGAIBase::readFromScenario(SGPropertyNode* scFileNode)
setSMPath(submodels->getStringValue("path", ""));
}
- // By default, scenarios include the full path to any aircraft.
- _searchOrder = DATA_ONLY;
-
string searchOrder = scFileNode->getStringValue("search-order", "");
if (!searchOrder.empty()) {
if (searchOrder == "DATA_ONLY") {
diff --git a/src/AIModel/AIStatic.cxx b/src/AIModel/AIStatic.cxx
index 278ee6c86..3a1f65715 100644
--- a/src/AIModel/AIStatic.cxx
+++ b/src/AIModel/AIStatic.cxx
@@ -34,7 +34,7 @@ using std::string;
FGAIStatic::FGAIStatic() : FGAIBase(otStatic, false) {
- _searchOrder = PREFER_AI;
+ _searchOrder = DATA_ONLY;
}