fly/flightgear
1
0
Fork 0
Code Activity

Patch from Fred Bouvier to use multi-platform ul library from plib for directory searching instead of ifdefs

Browse source
This commit is contained in:
daveluff 2004-03-29 10:20:19 +00:00
parent dc41cdb948
commit 0bea768f24
1 changed files with 14 additions and 51 deletions

65
src/ATC/AIMgr.cxx
View file

@ -74,16 +74,16 @@ void FGAIMgr::init() {
// Hack alert - Hardwired paths!! // Hack alert - Hardwired paths!!
string planepath = "Aircraft/c172/Models/c172-dpm.ac"; string planepath = "Aircraft/c172/Models/c172-dpm.ac";
_defaultModel = sgLoad3DModel( globals->get_fg_root(), _defaultModel = sgLoad3DModel( globals->get_fg_root(),
planepath.c_str(), planepath.c_str(),
globals->get_props(), globals->get_props(),
globals->get_sim_time_sec() ); globals->get_sim_time_sec() );
planepath = "Aircraft/pa28-161/Models/pa28-161.ac"; planepath = "Aircraft/pa28-161/Models/pa28-161.ac";
_piperModel = sgLoad3DModel( globals->get_fg_root(), _piperModel = sgLoad3DModel( globals->get_fg_root(),
planepath.c_str(), planepath.c_str(),
globals->get_props(), globals->get_props(),
globals->get_sim_time_sec() ); globals->get_sim_time_sec() );
// go through the $FG_ROOT/ATC directory and find all *.taxi files // go through the $FG_ROOT/ATC directory and find all *.taxi files
SGPath path(globals->get_fg_root()); SGPath path(globals->get_fg_root());
path.append("ATC/"); path.append("ATC/");
@ -92,50 +92,14 @@ void FGAIMgr::init() {
string file, f_ident; string file, f_ident;
int pos; int pos;
// WARNING - I (DCL) haven't tested this on MSVC - this is simply cribbed from TerraGear ulDir *d;
#ifdef _MSC_VER struct ulDirEnt *de;
long hfile;
struct _finddata_t de;
string path_str;
path_str = dir + "\\*.*"; if ( (d = ulOpenDir( dir.c_str() )) == NULL ) {
if ( ( hfile = _findfirst( path.c_str(), &de ) ) == -1 ) {
SG_LOG(SG_ATC, SG_WARN, "cannot open directory " << dir);
} else {
// load all .taxi files
do {
file = de.name;
pos = file.find(".");
ext = file.substr(pos + 1);
if(ext == "taxi") {
f_ident = file.substr(0, pos);
FGAirport a;
if(dclFindAirportID(f_ident, &a)) {
SGBucket sgb(a.longitude, a.latitude);
int idx = sgb.gen_index();
if(facilities.find(idx) != facilities.end()) {
facilities[idx]->push_back(f_ident);
} else {
ID_list_type* apts = new ID_list_type;
apts->push_back(f_ident);
facilities[idx] = apts;
}
SG_LOG(SG_ATC, SG_BULK, "Mapping " << f_ident << " to bucket " << idx);
}
}
} while ( _findnext( hfile, &de ) == 0 );
}
#else
DIR *d;
struct dirent *de;
if ( (d = opendir( dir.c_str() )) == NULL ) {
SG_LOG(SG_ATC, SG_WARN, "cannot open directory " << dir); SG_LOG(SG_ATC, SG_WARN, "cannot open directory " << dir);
} else { } else {
// load all .taxi files // load all .taxi files
while ( (de = readdir(d)) != NULL ) { while ( (de = ulReadDir(d)) != NULL ) {
file = de->d_name; file = de->d_name;
pos = file.find("."); pos = file.find(".");
ext = file.substr(pos + 1); ext = file.substr(pos + 1);
@ -156,10 +120,9 @@ void FGAIMgr::init() {
} }
} }
} }
closedir(d); ulCloseDir(d);
} }
#endif
// See if are in range at startup and activate if necessary // See if are in range at startup and activate if necessary
SearchByPos(15.0); SearchByPos(15.0);