X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fglobals.cxx;h=da3de6a46beeba1fabe72597bd86356dde77e94a;hb=224afcc7e4cb4191be15f3df025164fcd83f5102;hp=6a9b3f88cd92ca2355d5e79080a6d642a0eb7300;hpb=ee065ee6efa09dcfbe13bd2bb7d319069ba9d1f8;p=flightgear.git diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx index 6a9b3f88c..da3de6a46 100644 --- a/src/Main/globals.cxx +++ b/src/Main/globals.cxx @@ -15,8 +15,8 @@ // General Public License for more details. // // You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// along with this program; if not, write to the Free Software Foundation, +// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // // $Id$ @@ -24,9 +24,30 @@ # include #endif -#include #include #include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "globals.hxx" #include "renderer.hxx" @@ -46,48 +67,44 @@ FGGlobals *globals; // Constructor FGGlobals::FGGlobals() : + props( new SGPropertyNode ), + initial_state( NULL ), + locale( NULL ), renderer( new FGRenderer ), subsystem_mgr( new SGSubsystemMgr ), event_mgr( new SGEventMgr ), + soundmgr( new SGSoundMgr ), sim_time_sec( 0.0 ), fg_root( "" ), -#if defined(FX) && defined(XMESA) - fullscreen( true ), -#endif warp( 0 ), warp_delta( 0 ), time_params( NULL ), ephem( NULL ), mag( NULL ), + matlib( NULL ), route_mgr( NULL ), current_panel( NULL ), - soundmgr( NULL ), - airports( NULL ), ATC_mgr( NULL ), - ATC_display( NULL ), AI_mgr( NULL ), controls( NULL ), viewmgr( NULL ), - props( new SGPropertyNode ), - initial_state( NULL ), - locale( NULL ), - commands( new SGCommandMgr ), - model_lib( NULL ), + commands( SGCommandMgr::instance() ), acmodel( NULL ), model_mgr( NULL ), channel_options_list( NULL ), initial_waypoints( NULL ), scenery( NULL ), tile_mgr( NULL ), - io( new FGIO ), + fontcache ( new FGFontCache ), navlist( NULL ), loclist( NULL ), gslist( NULL ), dmelist( NULL ), - mkrlist( NULL ), tacanlist( NULL ), - carrierlist( NULL ), - fixlist( NULL ) + carrierlist( NULL ), + channellist( NULL ), + airwaynet( NULL ), + multiplayer_mgr( NULL ) { } @@ -95,31 +112,82 @@ FGGlobals::FGGlobals() : // Destructor FGGlobals::~FGGlobals() { - delete soundmgr; + delete renderer; +// The AIModels manager performs a number of actions upon + // Shutdown that implicitly assume that other subsystems + // are still operational (Due to the dynamic allocation and + // deallocation of AIModel objects. To ensure we can safely + // shut down all subsystems, make sure we take down the + // AIModels system first. + subsystem_mgr->get_group(SGSubsystemMgr::GENERAL)->remove_subsystem("ai_model"); + // FGInput (FGInputEvent) and FGDialog calls get_subsystem() in their destructors, + // which is not safe since some subsystem are already deleted but can be referred. + // So these subsystems must be deleted prior to deleting subsystem_mgr unless + // ~SGSubsystemGroup and SGSubsystemMgr::get_subsystem are changed not to refer to + // deleted subsystems. + subsystem_mgr->get_group(SGSubsystemMgr::GENERAL)->remove_subsystem("input"); + subsystem_mgr->get_group(SGSubsystemMgr::GENERAL)->remove_subsystem("gui"); + subsystem_mgr->unbind(); delete subsystem_mgr; delete event_mgr; - delete initial_state; - delete props; - delete commands; - delete io; - delete renderer; + delete time_params; + delete ephem; + delete mag; + delete matlib; + delete route_mgr; + delete current_panel; + + delete ATC_mgr; + delete AI_mgr; + delete controls; + delete viewmgr; + +// delete commands; + delete acmodel; + delete model_mgr; + delete channel_options_list; delete initial_waypoints; + delete tile_mgr; + delete scenery; + delete fontcache; + + delete navlist; + delete loclist; + delete gslist; + delete dmelist; + delete tacanlist; + delete carrierlist; + delete channellist; + delete airwaynet; + delete multiplayer_mgr; + + soundmgr->unbind(); + delete soundmgr; } // set the fg_root path void FGGlobals::set_fg_root (const string &root) { fg_root = root; - + // append /data to root if it exists SGPath tmp( fg_root ); tmp.append( "data" ); tmp.append( "version" ); if ( ulFileExists( tmp.c_str() ) ) { + fgGetNode("BAD_FG_ROOT", true)->setStringValue(fg_root); fg_root += "/data"; + fgGetNode("GOOD_FG_ROOT", true)->setStringValue(fg_root); + SG_LOG(SG_GENERAL, SG_ALERT, "***\n***\n*** Warning: changing bad FG_ROOT/--fg-root to '" + << fg_root << "'\n***\n***"); } - fgSetString("/sim/fg-root", fg_root.c_str()); + // remove /sim/fg-root before writing to prevent hijacking + SGPropertyNode *n = fgGetNode("/sim", true); + n->removeChild("fg-root", 0, false); + n = n->getChild("fg-root", 0, true); + n->setStringValue(fg_root.c_str()); + n->setAttribute(SGPropertyNode::WRITE, false); } void FGGlobals::set_fg_scenery (const string &scenery) { @@ -147,9 +215,11 @@ void FGGlobals::set_fg_scenery (const string &scenery) { ulDir *td = ulOpenDir( pt.c_str() ); ulDir *od = ulOpenDir( po.c_str() ); - if (td == NULL && od == NULL) + // "Terrain" and "Airports" directory don't exist. add directory as is + // otherwise, automatically append either Terrain, Objects, or both + //if (td == NULL && od == NULL) fg_scenery.push_back( path_list[i] ); - else { + //else { if (td != NULL) { fg_scenery.push_back( pt.str() ); ulCloseDir( td ); @@ -158,7 +228,7 @@ void FGGlobals::set_fg_scenery (const string &scenery) { fg_scenery.push_back( po.str() ); ulCloseDir( od ); } - } + //} // insert a marker for FGTileEntry::load(), so that // FG_SCENERY=A:B becomes list ["A/Terrain", "A/Objects", "", // "B/Terrain", "B/Objects", ""] @@ -194,6 +264,11 @@ FGGlobals::add_subsystem (const char * name, subsystem_mgr->add(name, subsystem, type, min_time_sec); } +SGSoundMgr * +FGGlobals::get_soundmgr () const +{ + return soundmgr; +} SGEventMgr * FGGlobals::get_event_mgr () const @@ -206,7 +281,6 @@ FGGlobals::get_event_mgr () const void FGGlobals::saveInitialState () { - delete initial_state; initial_state = new SGPropertyNode(); if (!copyProperties(props, initial_state))