fly/flightgear
1
0
Fork 0
Code Activity

Fix types name conflict on Windows platform

Browse source
This commit is contained in:
Roman Ludwicki 2023-09-13 15:59:03 +02:00 • committed by James Turner
parent 9efbdba004
commit 50f487b589
1 changed files with 297 additions and 297 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

370
src/Main/options.cxx
View file

@ -1793,29 +1793,29 @@ where:
ParamType::REGULAR - option requires a parameter but it is none of the ParamType::REGULAR - option requires a parameter but it is none of the
above cases: --option=value above cases: --option=value
type : OptionType::OPT_BOOL - property is a boolean type : OptionType::OPT_BOOL - property is a boolean
OptionType::STRING - property is a string OptionType::OPT_STRING - property is a string
OptionType::DOUBLE - property is a double OptionType::OPT_DOUBLE - property is a double
OptionType::INT - property is an integer OptionType::OPT_INT - property is an integer
OptionType::CHANNEL - name of option is the name of a channel OptionType::OPT_CHANNEL - name of option is the name of a channel
OptionType::FUNC - the option trigger a function OptionType::OPT_FUNC - the option trigger a function
property : property :
b_param : if type==OptionType::OPT_BOOL, b_param : if type==OptionType::OPT_BOOL,
value set to the property (param_type is ParamType::NONE for boolean) value set to the property (param_type is ParamType::NONE for boolean)
s_param : if type==OptionType::STRING, s_param : if type==OptionType::OPT_STRING,
value set to the property if param_type is ParamType::NONE value set to the property if param_type is ParamType::NONE
func : function called if type==OptionType::FUNC. if param_type is ParamType::VAL_BOOL func : function called if type==OptionType::OPT_FUNC. if param_type is ParamType::VAL_BOOL
or ParamType::REGULAR, the value is passed to the function as a string, or ParamType::REGULAR, the value is passed to the function as a string,
otherwise, s_param is passed. otherwise, s_param is passed.
For OptionType::DOUBLE and OptionType::INT, the parameter value is converted into a For OptionType::OPT_DOUBLE and OptionType::OPT_INT, the parameter value is converted into a
double or an integer and set to the property. double or an integer and set to the property.
For OptionType::CHANNEL, add_channel is called with the parameter value as the For OptionType::OPT_CHANNEL, add_channel is called with the parameter value as the
argument. argument.
*/ */
enum ParamType { NONE = 0, VAL_BOOL, REGULAR }; enum ParamType { NONE = 0, VAL_BOOL, REGULAR };
enum OptionType { OPT_BOOL = 0, STRING, DOUBLE, INT, CHANNEL, FUNC, IGNORE }; enum OptionType { OPT_BOOL = 0, OPT_STRING, OPT_DOUBLE, OPT_INT, OPT_CHANNEL, OPT_FUNC, OPT_IGNORE };
const int OPTION_MULTI = 1 << 17; const int OPTION_MULTI = 1 << 17;
struct OptionDesc { struct OptionDesc {
@ -1830,162 +1830,162 @@ struct OptionDesc {
const std::initializer_list<OptionDesc> fgOptionArray = { const std::initializer_list<OptionDesc> fgOptionArray = {
// clang-format off // clang-format off
{"language", ParamType::REGULAR, OptionType::IGNORE, "", false, "", 0 }, {"language", ParamType::REGULAR, OptionType::OPT_IGNORE, "", false, "", 0 },
{"console", ParamType::VAL_BOOL, OptionType::FUNC, "", false, "true", fgOptConsole }, {"console", ParamType::VAL_BOOL, OptionType::OPT_FUNC, "", false, "true", fgOptConsole },
{"compositor", ParamType::REGULAR, OptionType::STRING, "/sim/rendering/default-compositor", false, "", 0 }, {"compositor", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/rendering/default-compositor", false, "", 0 },
{"metar", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptMetar }, {"metar", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptMetar },
{"browser-app", ParamType::REGULAR, OptionType::STRING, "/sim/startup/browser-app", false, "", 0 }, {"browser-app", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/startup/browser-app", false, "", 0 },
{"sound-device", ParamType::REGULAR, OptionType::STRING, "/sim/sound/device-name", false, "", 0 }, {"sound-device", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/sound/device-name", false, "", 0 },
{"airport", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptAirport }, {"airport", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptAirport },
{"runway", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptRunway }, {"runway", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptRunway },
{"vor", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptVOR }, {"vor", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptVOR },
{"vor-frequency", ParamType::REGULAR, OptionType::DOUBLE, "/sim/presets/vor-freq", false, "", fgOptVOR }, {"vor-frequency", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/sim/presets/vor-freq", false, "", fgOptVOR },
{"ndb", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptNDB }, {"ndb", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptNDB },
{"ndb-frequency", ParamType::REGULAR, OptionType::DOUBLE, "/sim/presets/ndb-freq", false, "", fgOptVOR }, {"ndb-frequency", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/sim/presets/ndb-freq", false, "", fgOptVOR },
{"carrier", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptCarrier }, {"carrier", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptCarrier },
{"carrier-position", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptCarrierPos }, {"carrier-position", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptCarrierPos },
{"fix", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptFIX }, {"fix", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptFIX },
{"tacan", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptTACAN }, {"tacan", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptTACAN },
{"offset-distance", ParamType::REGULAR, OptionType::DOUBLE, "/sim/presets/offset-distance-nm", false, "", 0 }, {"offset-distance", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/sim/presets/offset-distance-nm", false, "", 0 },
{"offset-azimuth", ParamType::REGULAR, OptionType::DOUBLE, "/sim/presets/offset-azimuth-deg", false, "", 0 }, {"offset-azimuth", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/sim/presets/offset-azimuth-deg", false, "", 0 },
{"lon", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptLon }, {"lon", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptLon },
{"lat", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptLat }, {"lat", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptLat },
{"altitude", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptAltitude }, {"altitude", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptAltitude },
{"uBody", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptUBody }, {"uBody", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptUBody },
{"vBody", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptVBody }, {"vBody", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptVBody },
{"wBody", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptWBody }, {"wBody", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptWBody },
{"vNorth", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptVNorth }, {"vNorth", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptVNorth },
{"vEast", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptVEast }, {"vEast", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptVEast },
{"vDown", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptVDown }, {"vDown", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptVDown },
{"vc", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptVc }, {"vc", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptVc },
{"mach", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptMach }, {"mach", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptMach },
{"heading", ParamType::REGULAR, OptionType::DOUBLE, "/sim/presets/heading-deg", false, "", 0 }, {"heading", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/sim/presets/heading-deg", false, "", 0 },
{"roll", ParamType::REGULAR, OptionType::DOUBLE, "/sim/presets/roll-deg", false, "", 0 }, {"roll", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/sim/presets/roll-deg", false, "", 0 },
{"pitch", ParamType::REGULAR, OptionType::DOUBLE, "/sim/presets/pitch-deg", false, "", 0 }, {"pitch", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/sim/presets/pitch-deg", false, "", 0 },
{"glideslope", ParamType::REGULAR, OptionType::DOUBLE, "/sim/presets/glideslope-deg", false, "", 0 }, {"glideslope", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/sim/presets/glideslope-deg", false, "", 0 },
{"roc", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptRoc }, {"roc", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptRoc },
{"fg-root", ParamType::REGULAR, OptionType::IGNORE, "", false, "", 0 }, {"fg-root", ParamType::REGULAR, OptionType::OPT_IGNORE, "", false, "", 0 },
{"fg-scenery", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptFgScenery }, {"fg-scenery", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptFgScenery },
{"terrain-engine", ParamType::REGULAR, OptionType::STRING, "/sim/scenery/engine", false, "tilecache", 0 }, {"terrain-engine", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/scenery/engine", false, "tilecache", 0 },
{"lod-levels", ParamType::REGULAR, OptionType::STRING, "/sim/scenery/lod-levels", false, "1 3 5 7", 0 }, {"lod-levels", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/scenery/lod-levels", false, "1 3 5 7", 0 },
{"lod-res", ParamType::REGULAR, OptionType::STRING, "/sim/scenery/lod-res", false, "1", 0 }, {"lod-res", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/scenery/lod-res", false, "1", 0 },
{"lod-texturing", ParamType::REGULAR, OptionType::STRING, "/sim/scenery/lod-texturing", false, "bluemarble", 0 }, {"lod-texturing", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/scenery/lod-texturing", false, "bluemarble", 0 },
{"lod-range-mult", ParamType::REGULAR, OptionType::STRING, "/sim/scenery/lod-range-mult", false, "2", 0 }, {"lod-range-mult", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/scenery/lod-range-mult", false, "2", 0 },
{"fg-aircraft", ParamType::REGULAR, OptionType::IGNORE | OPTION_MULTI, "", false, "", 0 }, {"fg-aircraft", ParamType::REGULAR, OptionType::OPT_IGNORE | OPTION_MULTI, "", false, "", 0 },
{"fdm", ParamType::REGULAR, OptionType::STRING, "/sim/flight-model", false, "", 0 }, {"fdm", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/flight-model", false, "", 0 },
{"aero", ParamType::REGULAR, OptionType::STRING, "/sim/aero", false, "", 0 }, {"aero", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/aero", false, "", 0 },
{"aircraft-dir", ParamType::REGULAR, OptionType::IGNORE, "", false, "", 0 }, {"aircraft-dir", ParamType::REGULAR, OptionType::OPT_IGNORE, "", false, "", 0 },
{"state", ParamType::REGULAR, OptionType::IGNORE, "", false, "", 0 }, {"state", ParamType::REGULAR, OptionType::OPT_IGNORE, "", false, "", 0 },
{"model-hz", ParamType::REGULAR, OptionType::INT, "/sim/model-hz", false, "", 0 }, {"model-hz", ParamType::REGULAR, OptionType::OPT_INT, "/sim/model-hz", false, "", 0 },
{"max-fps", ParamType::REGULAR, OptionType::DOUBLE, "/sim/frame-rate-throttle-hz", false, "", 0 }, {"max-fps", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/sim/frame-rate-throttle-hz", false, "", 0 },
{"speed", ParamType::REGULAR, OptionType::DOUBLE, "/sim/speed-up", false, "", 0 }, {"speed", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/sim/speed-up", false, "", 0 },
{"trim", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/presets/trim", true, "", 0 }, {"trim", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/presets/trim", true, "", 0 },
{"notrim", ParamType::VAL_BOOL, OptionType::FUNC, "", false, "true", fgOptNoTrim }, {"notrim", ParamType::VAL_BOOL, OptionType::OPT_FUNC, "", false, "true", fgOptNoTrim },
{"on-ground", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/presets/onground", true, "", 0 }, {"on-ground", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/presets/onground", true, "", 0 },
{"in-air", ParamType::VAL_BOOL, OptionType::FUNC, "", false, "true", fgOptInAir }, {"in-air", ParamType::VAL_BOOL, OptionType::OPT_FUNC, "", false, "true", fgOptInAir },
{"fog-disable", ParamType::NONE, OptionType::STRING, "/sim/rendering/fog", false, "disabled", 0 }, {"fog-disable", ParamType::NONE, OptionType::OPT_STRING, "/sim/rendering/fog", false, "disabled", 0 },
{"fog-fastest", ParamType::NONE, OptionType::STRING, "/sim/rendering/fog", false, "fastest", 0 }, {"fog-fastest", ParamType::NONE, OptionType::OPT_STRING, "/sim/rendering/fog", false, "fastest", 0 },
{"fog-nicest", ParamType::NONE, OptionType::STRING, "/sim/rendering/fog", false, "nicest", 0 }, {"fog-nicest", ParamType::NONE, OptionType::OPT_STRING, "/sim/rendering/fog", false, "nicest", 0 },
{"fov", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptFov }, {"fov", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptFov },
{"aspect-ratio-multiplier", ParamType::REGULAR, OptionType::DOUBLE, "/sim/current-view/aspect-ratio-multiplier", false, "", 0 }, {"aspect-ratio-multiplier", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/sim/current-view/aspect-ratio-multiplier", false, "", 0 },
{"shading-flat", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/shading", false, "", 0 }, {"shading-flat", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/shading", false, "", 0 },
{"shading-smooth", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/shading", true, "", 0 }, {"shading-smooth", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/shading", true, "", 0 },
{"texture-filtering", ParamType::NONE, OptionType::INT, "/sim/rendering/filtering", 1, "", 0 }, {"texture-filtering", ParamType::NONE, OptionType::OPT_INT, "/sim/rendering/filtering", 1, "", 0 },
{"materials-file", ParamType::REGULAR, OptionType::STRING, "/sim/rendering/materials-file", false, "", 0 }, {"materials-file", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/rendering/materials-file", false, "", 0 },
{"terrasync-dir", ParamType::REGULAR, OptionType::IGNORE, "", false, "", 0 }, {"terrasync-dir", ParamType::REGULAR, OptionType::OPT_IGNORE, "", false, "", 0 },
{"download-dir", ParamType::REGULAR, OptionType::IGNORE, "", false, "", 0 }, {"download-dir", ParamType::REGULAR, OptionType::OPT_IGNORE, "", false, "", 0 },
{"texture-cache-dir", ParamType::REGULAR, OptionType::IGNORE, "", false, "", 0 }, {"texture-cache-dir", ParamType::REGULAR, OptionType::OPT_IGNORE, "", false, "", 0 },
{"allow-nasal-read", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptAllowNasalRead }, {"allow-nasal-read", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptAllowNasalRead },
{"geometry", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptGeometry }, {"geometry", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptGeometry },
{"bpp", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptBpp }, {"bpp", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptBpp },
{"units-feet", ParamType::NONE, OptionType::STRING, "/sim/startup/units", false, "feet", 0 }, {"units-feet", ParamType::NONE, OptionType::OPT_STRING, "/sim/startup/units", false, "feet", 0 },
{"units-meters", ParamType::NONE, OptionType::STRING, "/sim/startup/units", false, "meters", 0 }, {"units-meters", ParamType::NONE, OptionType::OPT_STRING, "/sim/startup/units", false, "meters", 0 },
{"timeofday", ParamType::REGULAR, OptionType::STRING, "/sim/startup/time-offset-type", false, "noon", 0 }, {"timeofday", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/startup/time-offset-type", false, "noon", 0 },
{"time-offset", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptTimeOffset }, {"time-offset", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptTimeOffset },
{"time-match-real", ParamType::NONE, OptionType::STRING, "/sim/startup/time-offset-type", false, "system-offset", 0 }, {"time-match-real", ParamType::NONE, OptionType::OPT_STRING, "/sim/startup/time-offset-type", false, "system-offset", 0 },
{"time-match-local", ParamType::NONE, OptionType::STRING, "/sim/startup/time-offset-type", false, "latitude-offset", 0 }, {"time-match-local", ParamType::NONE, OptionType::OPT_STRING, "/sim/startup/time-offset-type", false, "latitude-offset", 0 },
{"start-date-sys", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptStartDateSys }, {"start-date-sys", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptStartDateSys },
{"start-date-lat", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptStartDateLat }, {"start-date-lat", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptStartDateLat },
{"start-date-gmt", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptStartDateGmt }, {"start-date-gmt", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptStartDateGmt },
{"hud-tris", ParamType::NONE, OptionType::STRING, "/sim/hud/frame-stat-type", false, "tris", 0 }, {"hud-tris", ParamType::NONE, OptionType::OPT_STRING, "/sim/hud/frame-stat-type", false, "tris", 0 },
{"hud-culled", ParamType::NONE, OptionType::STRING, "/sim/hud/frame-stat-type", false, "culled", 0 }, {"hud-culled", ParamType::NONE, OptionType::OPT_STRING, "/sim/hud/frame-stat-type", false, "culled", 0 },
{"atcsim", ParamType::REGULAR, OptionType::CHANNEL, "", false, "dummy", 0 }, {"atcsim", ParamType::REGULAR, OptionType::OPT_CHANNEL, "", false, "dummy", 0 },
{"atlas", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"atlas", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"httpd", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptHttpd }, {"httpd", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptHttpd },
{"jpg-httpd", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptJpgHttpd }, {"jpg-httpd", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptJpgHttpd },
{"native", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"native", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"native-ctrls", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"native-ctrls", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"native-fdm", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"native-fdm", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"native-gui", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"native-gui", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"dds-props", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"dds-props", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"opengc", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"opengc", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"AV400", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"AV400", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"AV400Sim", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"AV400Sim", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"AV400WSimA", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"AV400WSimA", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"AV400WSimB", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"AV400WSimB", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"flarm", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"flarm", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"garmin", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"garmin", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"igc", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"igc", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"nmea", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"nmea", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"generic", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"generic", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"props", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"props", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"telnet", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"telnet", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"pve", ParamType::REGULAR, OptionType::CHANNEL, "", false, "", 0 }, {"pve", ParamType::REGULAR, OptionType::OPT_CHANNEL, "", false, "", 0 },
{"ray", ParamType::REGULAR, OptionType::CHANNEL, "", false, "", 0 }, {"ray", ParamType::REGULAR, OptionType::OPT_CHANNEL, "", false, "", 0 },
{"rul", ParamType::REGULAR, OptionType::CHANNEL, "", false, "", 0 }, {"rul", ParamType::REGULAR, OptionType::OPT_CHANNEL, "", false, "", 0 },
{"joyclient", ParamType::REGULAR, OptionType::CHANNEL, "", false, "", 0 }, {"joyclient", ParamType::REGULAR, OptionType::OPT_CHANNEL, "", false, "", 0 },
{"jsclient", ParamType::REGULAR, OptionType::CHANNEL, "", false, "", 0 }, {"jsclient", ParamType::REGULAR, OptionType::OPT_CHANNEL, "", false, "", 0 },
{"proxy", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgSetupProxy }, {"proxy", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgSetupProxy },
{"callsign", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptCallSign}, {"callsign", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptCallSign},
{"multiplay", ParamType::REGULAR, OptionType::CHANNEL | OPTION_MULTI, "", false, "", 0 }, {"multiplay", ParamType::REGULAR, OptionType::OPT_CHANNEL | OPTION_MULTI, "", false, "", 0 },
#if FG_HAVE_HLA #if FG_HAVE_HLA
{"hla", ParamType::REGULAR, OptionType::CHANNEL, "", false, "", 0 }, {"hla", ParamType::REGULAR, OptionType::OPT_CHANNEL, "", false, "", 0 },
{"hla-local", ParamType::REGULAR, OptionType::CHANNEL, "", false, "", 0 }, {"hla-local", ParamType::REGULAR, OptionType::OPT_CHANNEL, "", false, "", 0 },
#endif #endif
{"trace-read", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptTraceRead }, {"trace-read", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptTraceRead },
{"trace-write", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptTraceWrite }, {"trace-write", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptTraceWrite },
{"log-level", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptLogLevel }, {"log-level", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptLogLevel },
{"log-class", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptLogClasses }, {"log-class", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptLogClasses },
{"log-dir", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptLogDir }, {"log-dir", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptLogDir },
{"view-offset", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptViewOffset }, {"view-offset", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptViewOffset },
{"visibility", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptVisibilityMeters }, {"visibility", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptVisibilityMeters },
{"visibility-miles", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptVisibilityMiles }, {"visibility-miles", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptVisibilityMiles },
{"random-wind", ParamType::NONE, OptionType::FUNC, "", false, "", fgOptRandomWind }, {"random-wind", ParamType::NONE, OptionType::OPT_FUNC, "", false, "", fgOptRandomWind },
{"wind", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptWind }, {"wind", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptWind },
{"turbulence", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptTurbulence }, {"turbulence", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptTurbulence },
{"ceiling", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptCeiling }, {"ceiling", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptCeiling },
{"wp", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptWp }, {"wp", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptWp },
{"flight-plan", ParamType::REGULAR, OptionType::STRING, "/autopilot/route-manager/file-path", false, "", NULL }, {"flight-plan", ParamType::REGULAR, OptionType::OPT_STRING, "/autopilot/route-manager/file-path", false, "", NULL },
{"config", ParamType::REGULAR, OptionType::IGNORE | OPTION_MULTI, "", false, "", 0 }, {"config", ParamType::REGULAR, OptionType::OPT_IGNORE | OPTION_MULTI, "", false, "", 0 },
{"addon", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptAddon }, {"addon", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptAddon },
{"data", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptAdditionalDataDir }, {"data", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptAdditionalDataDir },
{"aircraft", ParamType::REGULAR, OptionType::STRING, "/sim/aircraft", false, "", 0 }, {"aircraft", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/aircraft", false, "", 0 },
{"vehicle", ParamType::REGULAR, OptionType::STRING, "/sim/aircraft", false, "", 0 }, {"vehicle", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/aircraft", false, "", 0 },
{"failure", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptFailure }, {"failure", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptFailure },
{"com1", ParamType::REGULAR, OptionType::DOUBLE, "/instrumentation/comm[0]/frequencies/selected-mhz", false, "", 0 }, {"com1", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/instrumentation/comm[0]/frequencies/selected-mhz", false, "", 0 },
{"com2", ParamType::REGULAR, OptionType::DOUBLE, "/instrumentation/comm[1]/frequencies/selected-mhz", false, "", 0 }, {"com2", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/instrumentation/comm[1]/frequencies/selected-mhz", false, "", 0 },
{"nav1", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptNAV1 }, {"nav1", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptNAV1 },
{"nav2", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptNAV2 }, {"nav2", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptNAV2 },
{"adf", /*legacy*/ ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptADF }, {"adf", /*legacy*/ ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptADF },
{"adf1", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptADF1 }, {"adf1", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptADF1 },
{"adf2", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptADF2 }, {"adf2", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptADF2 },
{"dme", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptDME }, {"dme", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptDME },
{"min-status", ParamType::REGULAR, OptionType::STRING, "/sim/aircraft-min-status", false, "all", 0 }, {"min-status", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/aircraft-min-status", false, "all", 0 },
{"livery", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptLivery }, {"livery", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptLivery },
{"ai-scenario", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptScenario }, {"ai-scenario", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptScenario },
{"parking-id", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptParkpos }, {"parking-id", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptParkpos },
{"parkpos", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptParkpos }, {"parkpos", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptParkpos },
{"version", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "", true, "", nullptr }, {"version", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "", true, "", nullptr },
{"json-report", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "", true, "", nullptr }, {"json-report", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "", true, "", nullptr },
{"fgviewer", ParamType::NONE, OptionType::IGNORE, "", false, "", 0}, {"fgviewer", ParamType::NONE, OptionType::OPT_IGNORE, "", false, "", 0},
{"no-default-config", ParamType::VAL_BOOL, OptionType::IGNORE, "", false, "", 0}, {"no-default-config", ParamType::VAL_BOOL, OptionType::OPT_IGNORE, "", false, "", 0},
{"prop", ParamType::REGULAR, OptionType::FUNC | OPTION_MULTI, "", false, "", fgOptSetProperty}, {"prop", ParamType::REGULAR, OptionType::OPT_FUNC | OPTION_MULTI, "", false, "", fgOptSetProperty},
{"load-tape", ParamType::REGULAR, OptionType::FUNC, "", false, "", fgOptLoadTape }, {"load-tape", ParamType::REGULAR, OptionType::OPT_FUNC, "", false, "", fgOptLoadTape },
{"load-tape-fixed-dt", ParamType::REGULAR, OptionType::DOUBLE, "/sim/startup/load-tape/fixed-dt", false, "", nullptr }, {"load-tape-fixed-dt", ParamType::REGULAR, OptionType::OPT_DOUBLE, "/sim/startup/load-tape/fixed-dt", false, "", nullptr },
{"jsbsim-output-directive-file", ParamType::REGULAR, OptionType::STRING, "/sim/jsbsim/output-directive-file", false, "", nullptr }, {"jsbsim-output-directive-file", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/jsbsim/output-directive-file", false, "", nullptr },
{"graphics-preset", ParamType::REGULAR, OptionType::STRING, "/sim/rendering/preset", false, "", nullptr}, {"graphics-preset", ParamType::REGULAR, OptionType::OPT_STRING, "/sim/rendering/preset", false, "", nullptr},
{"show-aircraft", ParamType::VAL_BOOL, OptionType::IGNORE, "", true, "", nullptr }, {"show-aircraft", ParamType::VAL_BOOL, OptionType::OPT_IGNORE, "", true, "", nullptr },
{"show-sound-devices", ParamType::VAL_BOOL, OptionType::IGNORE, "", true, "", nullptr }, {"show-sound-devices", ParamType::VAL_BOOL, OptionType::OPT_IGNORE, "", true, "", nullptr },
// Enable/disable options that can be used in many ways, // Enable/disable options that can be used in many ways,
// with enable/disable prefixes as well as without, but with a value of 1/0 or true/false or yes/no. // with enable/disable prefixes as well as without, but with a value of 1/0 or true/false or yes/no.
@ -2033,9 +2033,9 @@ const std::initializer_list<OptionDesc> fgOptionArray = {
{"composite-viewer", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/rendering/composite-viewer-enabled", true, "", nullptr}, {"composite-viewer", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/rendering/composite-viewer-enabled", true, "", nullptr},
{"disable-composite-viewer", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/composite-viewer-enabled", false, "", nullptr}, {"disable-composite-viewer", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/composite-viewer-enabled", false, "", nullptr},
{"enable-composite-viewer", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/composite-viewer-enabled", true, "", nullptr}, {"enable-composite-viewer", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/composite-viewer-enabled", true, "", nullptr},
{"developer", ParamType::VAL_BOOL, OptionType::IGNORE | OptionType::OPT_BOOL, "", true, "", nullptr }, {"developer", ParamType::VAL_BOOL, OptionType::OPT_IGNORE | OptionType::OPT_BOOL, "", true, "", nullptr },
{"disable-developer", ParamType::NONE, OptionType::IGNORE | OptionType::OPT_BOOL, "", false, "", nullptr }, {"disable-developer", ParamType::NONE, OptionType::OPT_IGNORE | OptionType::OPT_BOOL, "", false, "", nullptr },
{"enable-developer", ParamType::NONE, OptionType::IGNORE | OptionType::OPT_BOOL, "", true, "", nullptr }, {"enable-developer", ParamType::NONE, OptionType::OPT_IGNORE | OptionType::OPT_BOOL, "", true, "", nullptr },
{"distance-attenuation", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/rendering/distance-attenuation", true, "", nullptr }, {"distance-attenuation", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/rendering/distance-attenuation", true, "", nullptr },
{"disable-distance-attenuation", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/distance-attenuation", false, "", nullptr }, {"disable-distance-attenuation", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/distance-attenuation", false, "", nullptr },
{"enable-distance-attenuation", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/distance-attenuation", true, "", nullptr }, {"enable-distance-attenuation", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/distance-attenuation", true, "", nullptr },
@ -2044,24 +2044,24 @@ const std::initializer_list<OptionDesc> fgOptionArray = {
{"enable-fgcom", ParamType::NONE, OptionType::OPT_BOOL, "/sim/fgcom/enabled", true, "", nullptr }, {"enable-fgcom", ParamType::NONE, OptionType::OPT_BOOL, "/sim/fgcom/enabled", true, "", nullptr },
{"disable-fgcom", ParamType::NONE, OptionType::OPT_BOOL, "/sim/fgcom/enabled", false, "", nullptr }, {"disable-fgcom", ParamType::NONE, OptionType::OPT_BOOL, "/sim/fgcom/enabled", false, "", nullptr },
#endif #endif
{"fpe", ParamType::VAL_BOOL, OptionType::IGNORE, "", true, "", nullptr }, {"fpe", ParamType::VAL_BOOL, OptionType::OPT_IGNORE, "", true, "", nullptr },
{"disable-fpe", ParamType::NONE, OptionType::IGNORE, "", false, "", nullptr }, {"disable-fpe", ParamType::NONE, OptionType::OPT_IGNORE, "", false, "", nullptr },
{"enable-fpe", ParamType::NONE, OptionType::IGNORE, "", true, "", nullptr }, {"enable-fpe", ParamType::NONE, OptionType::OPT_IGNORE, "", true, "", nullptr },
{"freeze", ParamType::VAL_BOOL, OptionType::FUNC, "", false, "true", fgOptFreeze }, {"freeze", ParamType::VAL_BOOL, OptionType::OPT_FUNC, "", false, "true", fgOptFreeze },
{"disable-freeze", ParamType::NONE, OptionType::FUNC, "", false, "false", fgOptFreeze }, {"disable-freeze", ParamType::NONE, OptionType::OPT_FUNC, "", false, "false", fgOptFreeze },
{"enable-freeze", ParamType::NONE, OptionType::FUNC, "", false, "true", fgOptFreeze }, {"enable-freeze", ParamType::NONE, OptionType::OPT_FUNC, "", false, "true", fgOptFreeze },
{"fuel-freeze", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/freeze/fuel", true, "", nullptr }, {"fuel-freeze", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/freeze/fuel", true, "", nullptr },
{"disable-fuel-freeze", ParamType::NONE, OptionType::OPT_BOOL, "/sim/freeze/fuel", false, "", nullptr }, {"disable-fuel-freeze", ParamType::NONE, OptionType::OPT_BOOL, "/sim/freeze/fuel", false, "", nullptr },
{"enable-fuel-freeze", ParamType::NONE, OptionType::OPT_BOOL, "/sim/freeze/fuel", true, "", nullptr }, {"enable-fuel-freeze", ParamType::NONE, OptionType::OPT_BOOL, "/sim/freeze/fuel", true, "", nullptr },
{"fullscreen", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/startup/fullscreen", true, "", nullptr }, {"fullscreen", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/startup/fullscreen", true, "", nullptr },
{"disable-fullscreen", ParamType::NONE, OptionType::OPT_BOOL, "/sim/startup/fullscreen", false, "", nullptr }, {"disable-fullscreen", ParamType::NONE, OptionType::OPT_BOOL, "/sim/startup/fullscreen", false, "", nullptr },
{"enable-fullscreen", ParamType::NONE, OptionType::OPT_BOOL, "/sim/startup/fullscreen", true, "", nullptr }, {"enable-fullscreen", ParamType::NONE, OptionType::OPT_BOOL, "/sim/startup/fullscreen", true, "", nullptr },
{"gui", ParamType::VAL_BOOL, OptionType::FUNC, "", false, "true", fgOptGUI }, {"gui", ParamType::VAL_BOOL, OptionType::OPT_FUNC, "", false, "true", fgOptGUI },
{"disable-gui", ParamType::NONE, OptionType::FUNC, "", false, "false", fgOptGUI }, {"disable-gui", ParamType::NONE, OptionType::OPT_FUNC, "", false, "false", fgOptGUI },
{"enable-gui", ParamType::NONE, OptionType::FUNC, "", false, "true", fgOptGUI }, {"enable-gui", ParamType::NONE, OptionType::OPT_FUNC, "", false, "true", fgOptGUI },
{"hold-short", ParamType::VAL_BOOL, OptionType::FUNC, "", false, "true", fgOptHoldShort }, {"hold-short", ParamType::VAL_BOOL, OptionType::OPT_FUNC, "", false, "true", fgOptHoldShort },
{"disable-hold-short", ParamType::NONE, OptionType::FUNC, "", false, "false", fgOptHoldShort }, {"disable-hold-short", ParamType::NONE, OptionType::OPT_FUNC, "", false, "false", fgOptHoldShort },
{"enable-hold-short", ParamType::NONE, OptionType::FUNC, "", false, "true", fgOptHoldShort }, {"enable-hold-short", ParamType::NONE, OptionType::OPT_FUNC, "", false, "true", fgOptHoldShort },
{"hud", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/hud/visibility[1]", true, "", nullptr }, {"hud", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/hud/visibility[1]", true, "", nullptr },
{"disable-hud", ParamType::NONE, OptionType::OPT_BOOL, "/sim/hud/visibility[1]", false, "", nullptr }, {"disable-hud", ParamType::NONE, OptionType::OPT_BOOL, "/sim/hud/visibility[1]", false, "", nullptr },
{"enable-hud", ParamType::NONE, OptionType::OPT_BOOL, "/sim/hud/visibility[1]", true, "", nullptr }, {"enable-hud", ParamType::NONE, OptionType::OPT_BOOL, "/sim/hud/visibility[1]", true, "", nullptr },
@ -2071,12 +2071,12 @@ const std::initializer_list<OptionDesc> fgOptionArray = {
{"horizon-effect", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/rendering/horizon-effect", true, "", nullptr }, {"horizon-effect", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/rendering/horizon-effect", true, "", nullptr },
{"disable-horizon-effect", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/horizon-effect", false, "", nullptr }, {"disable-horizon-effect", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/horizon-effect", false, "", nullptr },
{"enable-horizon-effect", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/horizon-effect", true, "", nullptr }, {"enable-horizon-effect", ParamType::NONE, OptionType::OPT_BOOL, "/sim/rendering/horizon-effect", true, "", nullptr },
{"ignore-autosave", ParamType::VAL_BOOL, OptionType::FUNC, "", false, "true", fgOptIgnoreAutosave }, {"ignore-autosave", ParamType::VAL_BOOL, OptionType::OPT_FUNC, "", false, "true", fgOptIgnoreAutosave },
{"disable-ignore-autosave", ParamType::NONE, OptionType::FUNC, "", false, "false", fgOptIgnoreAutosave }, {"disable-ignore-autosave", ParamType::NONE, OptionType::OPT_FUNC, "", false, "false", fgOptIgnoreAutosave },
{"enable-ignore-autosave", ParamType::NONE, OptionType::FUNC, "", false, "true", fgOptIgnoreAutosave }, {"enable-ignore-autosave", ParamType::NONE, OptionType::OPT_FUNC, "", false, "true", fgOptIgnoreAutosave },
{"launcher", ParamType::VAL_BOOL, OptionType::IGNORE, "", true, "", nullptr }, {"launcher", ParamType::VAL_BOOL, OptionType::OPT_IGNORE, "", true, "", nullptr },
{"disable-launcher", ParamType::NONE, OptionType::IGNORE, "", false, "", nullptr }, {"disable-launcher", ParamType::NONE, OptionType::OPT_IGNORE, "", false, "", nullptr },
{"enable-launcher", ParamType::NONE, OptionType::IGNORE, "", true, "", nullptr }, {"enable-launcher", ParamType::NONE, OptionType::OPT_IGNORE, "", true, "", nullptr },
{"load-tape-create-video", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/startup/load-tape/create-video", true, "", nullptr }, {"load-tape-create-video", ParamType::VAL_BOOL, OptionType::OPT_BOOL, "/sim/startup/load-tape/create-video", true, "", nullptr },
{"disable-load-tape-create-video", ParamType::NONE, OptionType::OPT_BOOL, "/sim/startup/load-tape/create-video", false, "", nullptr }, {"disable-load-tape-create-video", ParamType::NONE, OptionType::OPT_BOOL, "/sim/startup/load-tape/create-video", false, "", nullptr },
{"enable-load-tape-create-video", ParamType::NONE, OptionType::OPT_BOOL, "/sim/startup/load-tape/create-video", true, "", nullptr }, {"enable-load-tape-create-video", ParamType::NONE, OptionType::OPT_BOOL, "/sim/startup/load-tape/create-video", true, "", nullptr },
@ -2220,7 +2220,7 @@ public:
fgSetBool( desc->property, desc->b_param ); fgSetBool( desc->property, desc->b_param );
} }
break; break;
case OptionType::STRING: case OptionType::OPT_STRING:
if ( desc->param_type != ParamType::NONE && !arg_value.empty() ) { if ( desc->param_type != ParamType::NONE && !arg_value.empty() ) {
fgSetString( desc->property, arg_value.c_str() ); fgSetString( desc->property, arg_value.c_str() );
} else if ( desc->param_type == ParamType::NONE && arg_value.empty() ) { } else if ( desc->param_type == ParamType::NONE && arg_value.empty() ) {
@ -2233,7 +2233,7 @@ public:
return FG_OPTIONS_ERROR; return FG_OPTIONS_ERROR;
} }
break; break;
case OptionType::DOUBLE: case OptionType::OPT_DOUBLE:
if ( !arg_value.empty() ) { if ( !arg_value.empty() ) {
fgSetDouble( desc->property, atof( arg_value ) ); fgSetDouble( desc->property, atof( arg_value ) );
} else { } else {
@ -2241,7 +2241,7 @@ public:
return FG_OPTIONS_ERROR; return FG_OPTIONS_ERROR;
} }
break; break;
case OptionType::INT: case OptionType::OPT_INT:
if ( !arg_value.empty() ) { if ( !arg_value.empty() ) {
fgSetInt( desc->property, atoi( arg_value ) ); fgSetInt( desc->property, atoi( arg_value ) );
} else { } else {
@ -2249,7 +2249,7 @@ public:
return FG_OPTIONS_ERROR; return FG_OPTIONS_ERROR;
} }
break; break;
case OptionType::CHANNEL: case OptionType::OPT_CHANNEL:
// XXX return value of add_channel should be checked? // XXX return value of add_channel should be checked?
if ( desc->param_type != ParamType::NONE && !arg_value.empty() ) { if ( desc->param_type != ParamType::NONE && !arg_value.empty() ) {
add_channel( desc->option, arg_value ); add_channel( desc->option, arg_value );
@ -2263,7 +2263,7 @@ public:
return FG_OPTIONS_ERROR; return FG_OPTIONS_ERROR;
} }
break; break;
case OptionType::FUNC: case OptionType::OPT_FUNC:
if ( desc->param_type != ParamType::NONE && !arg_value.empty() ) { if ( desc->param_type != ParamType::NONE && !arg_value.empty() ) {
return desc->func( arg_value.c_str() ); return desc->func( arg_value.c_str() );
} else if ( arg_value.empty() && strlen(desc->s_param) ) { } else if ( arg_value.empty() && strlen(desc->s_param) ) {
@ -2279,7 +2279,7 @@ public:
SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << desc->option << "' does not have a parameter" ); SG_LOG( SG_GENERAL, SG_ALERT, "Option '" << desc->option << "' does not have a parameter" );
return FG_OPTIONS_ERROR; return FG_OPTIONS_ERROR;
case OptionType::IGNORE: case OptionType::OPT_IGNORE:
break; break;
} }