From 5446f74bec5e699456ae6c4142b844d207e4de66 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Mon, 10 Dec 2001 15:31:15 +0000
Subject: [PATCH] Tweaks to how we load aircraft defaults and definition file
 to make things more intuitive.  We switch to an include in the
 preferences.xml to include the default model, and then if the user specifies
 --aircraft=, that is expanded immediately so portions can be overwritten by
 subsequent command line options.

This required a slight format change to all the *-set.xml files.
---
 Aircraft/747-yasim-set.xml    | 31 +++++++++++-------------
 Aircraft/X15-set.xml          | 44 +++++++++++++++++------------------
 Aircraft/a4-yasim-set.xml     | 29 +++++++++++------------
 Aircraft/c172-ifr-set.xml     | 31 +++++++++++-------------
 Aircraft/c172-larcsim-set.xml | 30 +++++++++++-------------
 Aircraft/c172-set.xml         | 30 +++++++++++-------------
 Aircraft/c172-yasim-set.xml   | 33 ++++++++++++--------------
 Aircraft/c310-set.xml         | 32 ++++++++++++-------------
 Aircraft/c310-yasim-set.xml   | 32 ++++++++++++-------------
 Aircraft/shuttle-set.xml      | 32 ++++++++++++-------------
 10 files changed, 150 insertions(+), 174 deletions(-)

diff --git a/Aircraft/747-yasim-set.xml b/Aircraft/747-yasim-set.xml
index 6985fcd4c..e7a617f2c 100644
--- a/Aircraft/747-yasim-set.xml
+++ b/Aircraft/747-yasim-set.xml
@@ -11,25 +11,22 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
-<!-- c172 is default so basically we just need to specify the panel-->
- <sim>
-  <flight-model>yasim</flight-model>
-  <aero>747</aero>
-  <sound>true</sound>
 
-  <panel>
-   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
+ <flight-model>yasim</flight-model>
+ <aero>747</aero>
+ <sound>true</sound>
+
+ <panel>
+  <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
+  <visibility>true</visibility>
+ </panel>
+ <panel_2>
+  <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+ </panel_2>
   
-  <model>
-   <path><!-- you need to set this --></path>
-  </model>
-    
-</sim>
+ <model>
+  <path><!-- you need to set this --></path>
+ </model>
   
 </PropertyList>
 
diff --git a/Aircraft/X15-set.xml b/Aircraft/X15-set.xml
index c7d8ee6bc..c74b6a130 100644
--- a/Aircraft/X15-set.xml
+++ b/Aircraft/X15-set.xml
@@ -11,32 +11,30 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
-<!-- these are the three main components -->
- <sim>
-  <flight-model>jsb</flight-model>
-  <aero>X15</aero>
-  <sound>false</sound>
+ <!-- these are the three main components -->
 
-  <panel>
-   <path>Aircraft/X15/Panels/X15-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
-  
-  <!-- switching models doesn't work -->
-  <!-- gear up -->
-  <model>
-   <path>Aircraft/X15/Models/X15_flight.ac</path>
-  </model> 
-  <!-- gear down -->
-  <model_2>
-   <path>Aircraft/X15/Models/X15_landing.ac</path>
-  </model_2> 
+ <flight-model>jsb</flight-model>
+ <aero>X15</aero>
+ <sound>false</sound>
 
- </sim>
+ <panel>
+  <path>Aircraft/X15/Panels/X15-panel.xml</path>
+  <visibility>true</visibility>
+ </panel>
+ <panel_2>
+  <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+ </panel_2>
   
+ <!-- switching models doesn't work -->
+ <!-- gear up -->
+ <model>
+  <path>Aircraft/X15/Models/X15_flight.ac</path>
+ </model> 
+ <!-- gear down -->
+ <model_2>
+  <path>Aircraft/X15/Models/X15_landing.ac</path>
+ </model_2> 
+
 </PropertyList>
 
 
diff --git a/Aircraft/a4-yasim-set.xml b/Aircraft/a4-yasim-set.xml
index ad752fcb5..0dcd02700 100644
--- a/Aircraft/a4-yasim-set.xml
+++ b/Aircraft/a4-yasim-set.xml
@@ -11,25 +11,22 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
-<!-- c172 is default so basically we just need to specify the panel-->
- <sim>
-  <flight-model>yasim</flight-model>
-  <aero>a4</aero>
-  <sound>true</sound>
 
-  <panel>
-   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
+ <flight-model>yasim</flight-model>
+ <aero>a4</aero>
+ <sound>true</sound>
+
+ <panel>
+  <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
+ </panel>
+ <panel_2>
+  <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+ </panel_2>
   
-  <model>
-   <path><!-- you need to set this --></path>
-  </model>
+ <model>
+  <path><!-- you need to set this --></path>
+ </model>
     
-</sim>
-  
 </PropertyList>
 
 
diff --git a/Aircraft/c172-ifr-set.xml b/Aircraft/c172-ifr-set.xml
index f0961d8df..a7a3f1195 100644
--- a/Aircraft/c172-ifr-set.xml
+++ b/Aircraft/c172-ifr-set.xml
@@ -11,26 +11,23 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
-<!-- c172 is default so basically we just need to specify the panel-->
- <sim>
-  <flight-model>jsb</flight-model>
-  <aero>c172</aero>
-  <sound>true</sound>
 
-  <panel>
-   <path>Aircraft/c172/Panels/c172-ifr-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
+ <flight-model>jsb</flight-model>
+ <aero>c172</aero>
+ <sound>true</sound>
+
+ <panel>
+  <path>Aircraft/c172/Panels/c172-ifr-panel.xml</path>
+  <visibility>true</visibility>
+ </panel>
+ <panel_2>
+  <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+ </panel_2>
   
-  <model>
-   <path><!-- you need to set this --></path>
-  </model>
+ <model>
+  <path><!-- you need to set this --></path>
+ </model>
     
-</sim>
-  
 </PropertyList>
 
 
diff --git a/Aircraft/c172-larcsim-set.xml b/Aircraft/c172-larcsim-set.xml
index aac285085..811964668 100644
--- a/Aircraft/c172-larcsim-set.xml
+++ b/Aircraft/c172-larcsim-set.xml
@@ -11,24 +11,22 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
-<!-- c172 is default so basically we just need to specify the fdm -->
- <sim>
-  <flight-model>larcsim</flight-model>
-  <aero>c172</aero>
-  <sound>true</sound>
 
-  <panel>
-   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
+ <flight-model>larcsim</flight-model>
+ <aero>c172</aero>
+ <sound>true</sound>
 
-  <model>
-   <path><!-- you need to set this --></path>
-  </model>
-</sim>
+ <panel>
+  <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
+  <visibility>true</visibility>
+ </panel>
+ <panel_2>
+  <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+ </panel_2>
+
+ <model>
+  <path><!-- you need to set this --></path>
+ </model>
   
 </PropertyList>
 
diff --git a/Aircraft/c172-set.xml b/Aircraft/c172-set.xml
index 21d2d54fb..386f0a3fb 100644
--- a/Aircraft/c172-set.xml
+++ b/Aircraft/c172-set.xml
@@ -11,25 +11,23 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
- <sim>
-  <flight-model>jsb</flight-model>
-  <aero>c172</aero>
-  <sound>true</sound>
 
-  <panel>
-   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
+ <flight-model>jsb</flight-model>
+ <aero>c172</aero>
+ <sound>true</sound>
 
-  <model>
-   <path><!-- you need to set this --></path>
-  </model>
+ <panel>
+  <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
+  <visibility>true</visibility>
+ </panel>
+ <panel_2>
+  <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+ </panel_2>
+
+ <model>
+  <path><!-- you need to set this --></path>
+ </model>
     
-</sim>
-  
 </PropertyList>
 
 
diff --git a/Aircraft/c172-yasim-set.xml b/Aircraft/c172-yasim-set.xml
index 9d9e09537..ecc20c7fa 100644
--- a/Aircraft/c172-yasim-set.xml
+++ b/Aircraft/c172-yasim-set.xml
@@ -11,26 +11,23 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
-<!-- c172 is default so basically we just need to specify the panel-->
- <sim>
-  <flight-model>yasim</flight-model>
-  <aero>c172</aero>
-  <sound>true</sound>
-  
-  <panel>
-   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
 
-  <model>
-   <path><!-- you need to set this --></path>
-  </model>
-    
-</sim>
+ <flight-model>yasim</flight-model>
+ <aero>c172</aero>
+ <sound>true</sound>
   
+ <panel>
+  <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
+  <visibility>true</visibility>
+ </panel>
+ <panel_2>
+  <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+ </panel_2>
+
+ <model>
+  <path><!-- you need to set this --></path>
+ </model>
+    
 </PropertyList>
 
 
diff --git a/Aircraft/c310-set.xml b/Aircraft/c310-set.xml
index 992b3236a..7a231fb22 100644
--- a/Aircraft/c310-set.xml
+++ b/Aircraft/c310-set.xml
@@ -12,26 +12,24 @@ October 23 2001 John Check, fgpanels@rockfish.net
 
 <PropertyList>
 <!-- these are the three main components -->
- <sim>
-  <flight-model>jsb</flight-model>
-  <aero>c310</aero>
-  <sound>true</sound>
 
-  <panel>
-   <path>Aircraft/c310/c310-vfr-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c310/c310-mini-panel.xml</path>
-  </panel_2>
+ <flight-model>jsb</flight-model>
+ <aero>c310</aero>
+ <sound>true</sound>
+
+ <panel>
+  <path>Aircraft/c310/c310-vfr-panel.xml</path>
+  <visibility>true</visibility>
+ </panel>
+ <panel_2>
+  <path>Aircraft/c310/c310-mini-panel.xml</path>
+ </panel_2>
  
-  <!-- you need to download this model from the site listed above -->
-  <model>
-   <path>Aircraft/c310/Models/cessna310r.ac</path>
-  </model> 
+ <!-- you need to download this model from the site listed above -->
+ <model>
+  <path>Aircraft/c310/Models/cessna310r.ac</path>
+ </model> 
 
- </sim>
-  
 </PropertyList>
 
 
diff --git a/Aircraft/c310-yasim-set.xml b/Aircraft/c310-yasim-set.xml
index 4a6c761b9..16a21b84e 100644
--- a/Aircraft/c310-yasim-set.xml
+++ b/Aircraft/c310-yasim-set.xml
@@ -12,26 +12,24 @@ October 23 2001 John Check, fgpanels@rockfish.net
 
 <PropertyList>
 <!-- these are the three main components -->
- <sim>
-  <flight-model>yasim</flight-model>
-  <aero>c310</aero>
-  <sound>true</sound>
 
-  <panel>
-   <path>Aircraft/c310/c310-vfr-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c310/c310-mini-panel.xml</path>
-  </panel_2>
+ <flight-model>yasim</flight-model>
+ <aero>c310</aero>
+ <sound>true</sound>
 
-  <!-- you need to download this from the above website -->
-  <model>
-   <path>Aircraft/c310/Models/cessna310r.ac</path>
-  </model> 
+ <panel>
+  <path>Aircraft/c310/c310-vfr-panel.xml</path>
+  <visibility>true</visibility>
+ </panel>
+ <panel_2>
+  <path>Aircraft/c310/c310-mini-panel.xml</path>
+ </panel_2>
+
+ <!-- you need to download this from the above website -->
+ <model>
+  <path>Aircraft/c310/Models/cessna310r.ac</path>
+ </model> 
 
- </sim>
-  
 </PropertyList>
 
 
diff --git a/Aircraft/shuttle-set.xml b/Aircraft/shuttle-set.xml
index 6c59dbbe7..990ee7fc7 100644
--- a/Aircraft/shuttle-set.xml
+++ b/Aircraft/shuttle-set.xml
@@ -11,25 +11,23 @@ October 23 2001 John Check, fgpanels@rockfish.net
 -->
 
 <PropertyList>
- <sim>
-  <flight-model>jsb</flight-model>
-  <aero>shuttle</aero>
-  <sound>true</sound>
 
-  <panel>
-   <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
-   <visibility>true</visibility>
-  </panel>
-  <panel_2>
-   <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
-  </panel_2>
+ <flight-model>jsb</flight-model>
+ <aero>shuttle</aero>
+ <sound>true</sound>
+
+ <panel>
+  <path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
+  <visibility>true</visibility>
+ </panel>
+ <panel_2>
+  <path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
+ </panel_2>
+
+ <model>
+  <path><!-- you need to set this --></path>
+ </model>
 
-  <model>
-   <path><!-- you need to set this --></path>
-  </model>
-    
-</sim>
-  
 </PropertyList>