#include <Aircraft/controls.hxx>
#include <Airports/runways.hxx>
-#include <ATCDCL/ATCmgr.hxx>
+#include <ATCDCL/ATISmgr.hxx>
#include <Autopilot/route_mgr.hxx>
-#include <Cockpit/panel.hxx>
#include <GUI/FGFontCache.hxx>
#include <GUI/gui.h>
#include <Model/acmodel.hxx>
#include <Scenery/scenery.hxx>
#include <Scenery/tilemgr.hxx>
#include <Navaids/navlist.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewmgr.hxx>
#include "globals.hxx"
-#include "renderer.hxx"
-#include "viewmgr.hxx"
+#include "locale.hxx"
#include "fg_props.hxx"
#include "fg_io.hxx"
FGGlobals::FGGlobals() :
props( new SGPropertyNode ),
initial_state( NULL ),
- locale( NULL ),
+ locale( new FGLocale(props) ),
renderer( new FGRenderer ),
subsystem_mgr( new SGSubsystemMgr ),
event_mgr( new SGEventMgr ),
sim_time_sec( 0.0 ),
fg_root( "" ),
+ fg_home( "" ),
time_params( NULL ),
ephem( NULL ),
mag( NULL ),
matlib( NULL ),
route_mgr( NULL ),
- current_panel( NULL ),
- ATC_mgr( NULL ),
+ ATIS_mgr( NULL ),
controls( NULL ),
viewmgr( NULL ),
commands( SGCommandMgr::instance() ),
delete mag;
delete matlib;
delete route_mgr;
- delete current_panel;
- delete ATC_mgr;
+ delete ATIS_mgr;
if (controls)
{
delete carrierlist;
delete channellist;
delete sound;
-}
+ delete locale;
+ locale = NULL;
+}
// set the fg_root path
void FGGlobals::set_fg_root (const string &root) {
simgear::ResourceManager::PRIORITY_DEFAULT);
}
+// set the fg_home path
+void FGGlobals::set_fg_home (const string &home) {
+ SGPath tmp(home);
+ fg_home = tmp.realpath();
+}
+
void FGGlobals::append_fg_scenery (const string &paths)
{
// fg_scenery.clear();
return simgear::ResourceManager::instance()->findPath(branch);
}
+SGPath FGGlobals::resolve_ressource_path(const std::string& branch) const
+{
+ return simgear::ResourceManager::instance()
+ ->findPath(branch, SGPath(fgGetString("/sim/aircraft-dir")));
+}
+
FGRenderer *
FGGlobals::get_renderer () const
{
// Load user settings from autosave.xml
void
-FGGlobals::loadUserSettings()
+FGGlobals::loadUserSettings(const SGPath& dataPath)
{
- // dummy method for now.
- //TODO Move code loading autosave.xml in here after the 2.6.0 release.
+ // remember that we have (tried) to load any existing autsave.xml
haveUserSettings = true;
+
+ SGPath autosaveFile = simgear::Dir(dataPath).file("autosave.xml");
+ SGPropertyNode autosave;
+ if (autosaveFile.exists()) {
+ SG_LOG(SG_INPUT, SG_INFO, "Reading user settings from " << autosaveFile.str());
+ try {
+ readProperties(autosaveFile.str(), &autosave, SGPropertyNode::USERARCHIVE);
+ } catch (sg_exception& e) {
+ SG_LOG(SG_INPUT, SG_WARN, "failed to read user settings:" << e.getMessage()
+ << "(from " << e.getOrigin() << ")");
+ }
+ }
+ copyProperties(&autosave, globals->get_props());
}
// Save user settings in autosave.xml
// don't save settings more than once on shutdown
haveUserSettings = false;
- SGPath autosaveFile(fgGetString("/sim/fg-home"));
+ SGPath autosaveFile(globals->get_fg_home());
autosaveFile.append( "autosave.xml" );
autosaveFile.create_dir( 0700 );
SG_LOG(SG_IO, SG_INFO, "Saving user settings to " << autosaveFile.str());
{
fgSetInt("/sim/time/warp-delta", d);
}
-
+
// end of globals.cxx