fly/flightgear
1
0
Fork 0
Code Activity

Tweak launcher location-arg knock-out mode.

Browse source 
Allow setting of various secondary location args without
knocking out the main ones. The user arg values still override, but
this allows selecting a runway (for example) and manually setting
altitude / heading / offset if desired.
This commit is contained in:
James Turner 2018-06-29 14:56:05 +01:00
parent 602c2c30dd
commit d126c5a3da
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/GUI/LauncherArgumentTokenizer.cxx
View file

@ -129,7 +129,7 @@ bool LauncherArgumentTokenizer::isValid() const
} }
const std::set<std::string> unsupportedArgs({ const std::set<std::string> unsupportedArgs({
"fg-aircraft", "fg-root", "fg-home", "aircraft-dir", "fg-scenery"}); "fg-aircraft", "fg-root", "fg-home", "aircraft-dir"});
bool LauncherArgumentTokenizer::haveUnsupportedArgs() const bool LauncherArgumentTokenizer::haveUnsupportedArgs() const
{ {
@ -147,11 +147,9 @@ void LauncherArgumentTokenizer::setArgString(QString argString)
} }
const std::set<std::string> positionalArgs({ const std::set<std::string> positionalArgs({
"lat", "lon", "vc", "vor", "ndb", "fix" "lat", "lon", "vor", "ndb", "fix"
"airport", "parkpos", "runway", "airport", "parkpos", "runway"
"heading", "altitude", "offset-azimuth", });
"offset-distance", "glideslope",
"on-ground"});
bool LauncherArgumentTokenizer::haveArgsIn(const std::set<std::string>& args) const bool LauncherArgumentTokenizer::haveArgsIn(const std::set<std::string>& args) const
{ {