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.
This commit is contained in:
parent
6299a67c71
commit
5446f74bec
10 changed files with 150 additions and 174 deletions
|
@ -11,8 +11,7 @@ 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>
|
||||
|
@ -29,8 +28,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
|
|||
<path><!-- you need to set this --></path>
|
||||
</model>
|
||||
|
||||
</sim>
|
||||
|
||||
</PropertyList>
|
||||
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ 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>
|
||||
|
@ -35,8 +35,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
|
|||
<path>Aircraft/X15/Models/X15_landing.ac</path>
|
||||
</model_2>
|
||||
|
||||
</sim>
|
||||
|
||||
</PropertyList>
|
||||
|
||||
|
||||
|
|
|
@ -11,8 +11,7 @@ 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>
|
||||
|
@ -28,8 +27,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
|
|||
<path><!-- you need to set this --></path>
|
||||
</model>
|
||||
|
||||
</sim>
|
||||
|
||||
</PropertyList>
|
||||
|
||||
|
||||
|
|
|
@ -11,8 +11,7 @@ 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>
|
||||
|
@ -29,8 +28,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
|
|||
<path><!-- you need to set this --></path>
|
||||
</model>
|
||||
|
||||
</sim>
|
||||
|
||||
</PropertyList>
|
||||
|
||||
|
||||
|
|
|
@ -11,8 +11,7 @@ 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>
|
||||
|
@ -28,7 +27,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
|
|||
<model>
|
||||
<path><!-- you need to set this --></path>
|
||||
</model>
|
||||
</sim>
|
||||
|
||||
</PropertyList>
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ October 23 2001 John Check, fgpanels@rockfish.net
|
|||
-->
|
||||
|
||||
<PropertyList>
|
||||
<sim>
|
||||
|
||||
<flight-model>jsb</flight-model>
|
||||
<aero>c172</aero>
|
||||
<sound>true</sound>
|
||||
|
@ -28,8 +28,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
|
|||
<path><!-- you need to set this --></path>
|
||||
</model>
|
||||
|
||||
</sim>
|
||||
|
||||
</PropertyList>
|
||||
|
||||
|
||||
|
|
|
@ -11,8 +11,7 @@ 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>
|
||||
|
@ -29,8 +28,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
|
|||
<path><!-- you need to set this --></path>
|
||||
</model>
|
||||
|
||||
</sim>
|
||||
|
||||
</PropertyList>
|
||||
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ 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>
|
||||
|
@ -30,8 +30,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
|
|||
<path>Aircraft/c310/Models/cessna310r.ac</path>
|
||||
</model>
|
||||
|
||||
</sim>
|
||||
|
||||
</PropertyList>
|
||||
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ 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>
|
||||
|
@ -30,8 +30,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
|
|||
<path>Aircraft/c310/Models/cessna310r.ac</path>
|
||||
</model>
|
||||
|
||||
</sim>
|
||||
|
||||
</PropertyList>
|
||||
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ October 23 2001 John Check, fgpanels@rockfish.net
|
|||
-->
|
||||
|
||||
<PropertyList>
|
||||
<sim>
|
||||
|
||||
<flight-model>jsb</flight-model>
|
||||
<aero>shuttle</aero>
|
||||
<sound>true</sound>
|
||||
|
@ -28,8 +28,6 @@ October 23 2001 John Check, fgpanels@rockfish.net
|
|||
<path><!-- you need to set this --></path>
|
||||
</model>
|
||||
|
||||
</sim>
|
||||
|
||||
</PropertyList>
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue