fly/flightgear
1
0
Fork 0
Code Activity

Allow FG data to be in $FG_ROOT/data or $FG_ROOT (looks in both places.)

Browse source
This commit is contained in:
curt 2003-04-24 02:18:12 +00:00
parent 485f799322
commit a16d03a6cd
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Main/globals.cxx
View file

@ -22,6 +22,7 @@
#include <simgear/misc/commands.hxx>
#include <simgear/misc/sg_path.hxx>
#include <Environment/environment_mgr.hxx>
@ -91,6 +92,20 @@ FGGlobals::~FGGlobals()
}
// 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() ) ) {
fg_root += "/data";
}
}
FGSubsystemMgr *
FGGlobals::get_subsystem_mgr () const
{

2
src/Main/globals.hxx
View file

@ -206,7 +206,7 @@ public:
inline void set_sim_time_sec (double t) { sim_time_sec = t; }
inline const string &get_fg_root () const { return fg_root; }
inline void set_fg_root (const string &root) { fg_root = root; }
void set_fg_root (const string &root);
inline const string &get_fg_scenery () const { return fg_scenery; }
inline void set_fg_scenery (const string &scenery) {