#endif
#include <simgear/compiler.h>
+#include <simgear/misc/exception.hxx>
#include STL_STRING
#include "fg_props.hxx"
#include "options.hxx"
#include "globals.hxx"
+#include "viewmgr.hxx"
#if defined(FX) && defined(XMESA)
#include <GL/xmesa.h>
old_path.append( "Thanks" );
sg_gzifstream old( old_path.str() );
if ( !old.is_open() ) {
- return "[none found]";
+ return "[none]";
} else {
- return "[old version, please upgrade]";
+ return "[old version]";
}
}
SGPath props_path(globals->get_fg_root());
props_path.append("preferences.xml");
SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
- if (!readProperties(props_path.str(), globals->get_props())) {
- SG_LOG(SG_INPUT, SG_ALERT, "Failed to read global preferences from "
- << props_path.str());
- } else {
- SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
+ try {
+ readProperties(props_path.str(), globals->get_props());
+ } catch (const sg_exception &e) {
+ string message = "Error reading global preferences: ";
+ message += e.getFormattedMessage();
+ SG_LOG(SG_INPUT, SG_ALERT, message);
+ exit(2);
}
+ SG_LOG(SG_INPUT, SG_INFO, "Finished Reading global preferences");
// Attempt to locate and parse the various config files in order
// from least precidence to greatest precidence
sgSetVec3( position, current_aircraft.fdm_state->get_Latitude(),
current_aircraft.fdm_state->get_Longitude(),
current_aircraft.fdm_state->get_Altitude() * SG_FEET_TO_METER );
- FGLocalWeatherDatabase::theFGLocalWeatherDatabase =
+ double init_vis = fgGetDouble("/environment/visibility-m");
+
+ FGLocalWeatherDatabase::DatabaseWorkingType working_type;
+
+ if (fgGetString("/environment/weather/working-type") == "internet")
+ {
+ working_type = FGLocalWeatherDatabase::use_internet;
+ } else {
+ working_type = FGLocalWeatherDatabase::default_mode;
+ }
+
+ if ( init_vis > 0 ) {
+ FGLocalWeatherDatabase::theFGLocalWeatherDatabase =
new FGLocalWeatherDatabase( position,
- globals->get_fg_root() );
+ globals->get_fg_root(),
+ working_type,
+ init_vis );
+ } else {
+ FGLocalWeatherDatabase::theFGLocalWeatherDatabase =
+ new FGLocalWeatherDatabase( position,
+ globals->get_fg_root(),
+ working_type );
+ }
+
// cout << theFGLocalWeatherDatabase << endl;
// cout << "visibility = "
// << theFGLocalWeatherDatabase->getWeatherVisibility() << endl;
WeatherDatabase = FGLocalWeatherDatabase::theFGLocalWeatherDatabase;
-
- double init_vis = fgGetDouble("/environment/visibility-m");
- if ( init_vis > 0 ) {
- WeatherDatabase->setWeatherVisibility( init_vis );
- }
// register the periodic update of the weather
global_events.Register( "weather update", fgUpdateWeatherDatabase,
// Initialize the controls subsystem.
////////////////////////////////////////////////////////////////////
- controls.init();
- controls.bind();
+ globals->get_controls()->init();
+ globals->get_controls()->bind();
////////////////////////////////////////////////////////////////////
cur_fdm_state->init();
- controls.reset_all();
+ globals->get_controls()->reset_all();
current_autopilot->reset();
fgUpdateSunPos();