fly/flightgear
1
0
Fork 0
Code Activity

Small tweaks to initialization sequence and logic so we can default to

Browse source 
a top level aircraft def file (c172-set.xml)

preferences.xml or --aircraft= or any other property setting mechanism can
be used to set the property "/sim/aircraft".  After all options and config
files are parsed, the contents of /sim/aircraft is expanded into a *-set.xml
file and loaded.
This commit is contained in:
curt 2001-12-09 05:19:50 +00:00
parent 9d54df6d87
commit 470292a434
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Main/fg_init.cxx
View file

@ -269,6 +269,20 @@ bool fgInitConfig ( int argc, char **argv ) {
// These will override anything specified in a config file
fgParseOptions(argc, argv);
// read in the top level aircraft definition file
SGPath apath( globals->get_fg_root() );
apath.append( "Aircraft" );
apath.append( fgGetString("/sim/aircraft") );
apath.concat( "-set.xml" );
try {
readProperties(apath.str(), globals->get_props());
} catch (const sg_exception &e) {
string message = "Error loading aircraft file: ";
message += e.getFormattedMessage();
SG_LOG(SG_INPUT, SG_ALERT, message);
exit(2);
}
return true;
}

13
src/Main/options.cxx
View file

@ -903,18 +903,7 @@ parse_option (const string& arg)
exit(2);
}
} else if ( arg.find( "--aircraft=" ) == 0 ) {
SGPath apath(globals->get_fg_root());
apath.append("Aircraft");
apath.append(arg.substr(11));
apath.concat("-set.xml");
try {
readProperties(apath.str(), globals->get_props());
} catch (const sg_exception &e) {
string message = "Error loading aircraft file: ";
message += e.getFormattedMessage();
SG_LOG(SG_INPUT, SG_ALERT, message);
exit(2);
}
fgSetString("/sim/aircraft", arg.substr(11));
} else {
SG_LOG( SG_GENERAL, SG_ALERT, "Unknown option '" << arg << "'" );
return FG_OPTIONS_ERROR;