fly/flightgear
1
0
Fork 0
Code Activity

Enable the airway database parsing.

Browse source
This commit is contained in:
durk 2006-07-27 14:49:41 +00:00
parent 10ebe06285
commit 943b1b8e79
4 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Airports/dynamics.cxx
View file

@ -465,11 +465,11 @@ void FGAirportDynamics::getActiveRunway(const string &trafficType, int action, s
RunwayGroup *currRunwayGroup = 0; RunwayGroup *currRunwayGroup = 0;
int nrActiveRunways = 0; int nrActiveRunways = 0;
time_t dayStart = fgGetLong("/sim/time/utc/day-seconds"); time_t dayStart = fgGetLong("/sim/time/utc/day-seconds");
if (((dayStart - lastUpdate) > 600) || trafficType != prevTrafficType) if ((fabs(dayStart - lastUpdate) > 600) || trafficType != prevTrafficType)
{ {
landing.clear(); landing.clear();
takeoff.clear(); takeoff.clear();
//lastUpdate = dayStart; lastUpdate = dayStart;
prevTrafficType = trafficType; prevTrafficType = trafficType;
FGEnvironment FGEnvironment

10
src/Main/fg_init.cxx
View file

@ -1085,6 +1085,16 @@ fgInitNav ()
fixlist->init( p_fix ); fixlist->init( p_fix );
globals->set_fixlist( fixlist ); globals->set_fixlist( fixlist );
SG_LOG(SG_GENERAL, SG_INFO, " Airways");
SGPath p_awy( globals->get_fg_root() );
p_awy.append( "Navaids/awy.dat" );
FGAirwayNetwork *awyNet = new FGAirwayNetwork;
//cerr << "Loading Airways" << endl;
awyNet->load (p_awy );
awyNet->init();
//cerr << "initializing airways" << endl;
globals->set_airwaynet( awyNet );
return true; return true;
} }

6
src/Main/globals.hxx
View file

@ -73,6 +73,7 @@ class FGControls;
class FGFlightPlanDispatcher; class FGFlightPlanDispatcher;
class FGIO; class FGIO;
class FGNavList; class FGNavList;
class FGAirwayNetwork;
class FGTACANList; class FGTACANList;
class FGFixList; class FGFixList;
class FGLight; class FGLight;
@ -210,6 +211,7 @@ private:
FGNavList *carrierlist; FGNavList *carrierlist;
FGTACANList *channellist; FGTACANList *channellist;
FGFixList *fixlist; FGFixList *fixlist;
FGAirwayNetwork *airwaynet;
//Mulitplayer managers //Mulitplayer managers
FGMultiplayMgr *multiplayer_mgr; FGMultiplayMgr *multiplayer_mgr;
@ -374,6 +376,10 @@ public:
inline FGTACANList *get_channellist() const { return channellist; } inline FGTACANList *get_channellist() const { return channellist; }
inline void set_channellist( FGTACANList *c ) { channellist = c; } inline void set_channellist( FGTACANList *c ) { channellist = c; }
inline FGAirwayNetwork *get_airwaynet() const { return airwaynet; }
inline void set_airwaynet( FGAirwayNetwork *a ) { airwaynet = a; }
/** /**
* Save the current state as the initial state. * Save the current state as the initial state.
*/ */

1
src/Traffic/SchedFlight.cxx
View file

@ -174,6 +174,7 @@ time_t FGScheduledFlight::processTimeString(const string& theTime)
{ {
timeOffsetInDays = 0; timeOffsetInDays = 0;
} }
// TODO: verify status of each token.
targetHour = atoi(timeCopy.substr(0,2).c_str()); targetHour = atoi(timeCopy.substr(0,2).c_str());
targetMinute = atoi(timeCopy.substr(3,5).c_str()); targetMinute = atoi(timeCopy.substr(3,5).c_str());
targetSecond = atoi(timeCopy.substr(6,8).c_str()); targetSecond = atoi(timeCopy.substr(6,8).c_str());