#include "simple.hxx"
+#include <cassert>
+
#include <simgear/misc/sg_path.hxx>
#include <simgear/props/props.hxx>
#include <simgear/props/props_io.hxx>
envMgr = (FGEnvironmentMgr *) globals->get_subsystem("environment");
}
- FGEnvironment stationWeather(envMgr->getEnvironment(mPosition));
+ // This forces West-facing rwys to be used in no-wind situations
+ // which is consistent with Flightgear's initial setup.
+ double hdg = 270;
+
+ if (envMgr) {
+ FGEnvironment stationWeather(envMgr->getEnvironment(mPosition));
- double windSpeed = stationWeather.get_wind_speed_kt();
- double hdg = stationWeather.get_wind_from_heading_deg();
- if (windSpeed <= 0.0) {
- hdg = 270; // This forces West-facing rwys to be used in no-wind situations
- // which is consistent with Flightgear's initial setup.
+ double windSpeed = stationWeather.get_wind_speed_kt();
+ if (windSpeed > 0.0) {
+ hdg = stationWeather.get_wind_from_heading_deg();
+ }
}
return findBestRunwayForHeading(hdg);
FGAirport* FGAirport::findByIdent(const std::string& aIdent)
{
FGPositionedRef r;
- AirportFilter filter;
+ PortsFilter filter;
r = FGPositioned::findNextWithPartialId(r, aIdent, &filter);
if (!r) {
return NULL; // we don't warn here, let the caller do that
FGAirport* FGAirport::getByIdent(const std::string& aIdent)
{
FGPositionedRef r;
- AirportFilter filter;
+ PortsFilter filter;
r = FGPositioned::findNextWithPartialId(r, aIdent, &filter);
if (!r) {
throw sg_range_exception("No such airport with ident: " + aIdent);
{
// allow users to disable the scenery data in the short-term
// longer term, this option can probably disappear
- if (!fgGetBool("/sim/use-scenery-airport-data")) {
+ if (!fgGetBool("/sim/paths/use-custom-scenery-data")) {
return;
}