fly/flightgear
1
0
Fork 0
Code Activity

Make --metar automatically imply --disable-real-weather-fetch

Browse source 
The --metar option has no effect unless --disable-real-weather-fetch is
also passed. This often makes users believe that --metar doesn't work.
Change the implementation for --metar so that it automatically implies
--disable-real-weather-fetch.
This commit is contained in:
Florent Rougon 2016-03-20 19:56:18 +01:00
parent 585b4a7f70
commit 0cfa4ced9c
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Main/options.cxx
View file

@ -1096,6 +1096,18 @@ fgOptVisibilityMiles( const char *arg )
return FG_OPTIONS_OK;
}
static int
fgOptMetar( const char *arg )
{
// The given METAR string cannot be effective without disabling
// real weather fetching.
fgSetBool("/environment/realwx/enabled", false);
// The user-supplied METAR string
fgSetString("/environment/metar/data", arg);
return FG_OPTIONS_OK;
}
static int
fgOptRandomWind( const char *arg )
{
@ -1531,7 +1543,7 @@ struct OptionDesc {
{"enable-random-buildings", false, OPTION_BOOL, "/sim/rendering/random-buildings", true, "", 0 },
{"disable-real-weather-fetch", false, OPTION_BOOL, "/environment/realwx/enabled", false, "", 0 },
{"enable-real-weather-fetch", false, OPTION_BOOL, "/environment/realwx/enabled", true, "", 0 },
{"metar", true, OPTION_STRING, "/environment/metar/data", false, "", 0 },
{"metar", true, OPTION_FUNC, "", false, "", fgOptMetar },
{"disable-ai-models", false, OPTION_BOOL, "/sim/ai/enabled", false, "", 0 },
{"enable-ai-models", false, OPTION_BOOL, "/sim/ai/enabled", true, "", 0 },
{"disable-ai-traffic", false, OPTION_BOOL, "/sim/traffic-manager/enabled", false, "", 0 },