fly/flightgear
1
0
Fork 0
Code Activity

Someone managed to commit changes as cvsguest, return to the original

Browse source 
version.  These changes need to be added via the proper channels.
This commit is contained in:
curt 2003-11-09 00:46:56 +00:00
parent 1bd99ddaf5
commit e07b153321
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ATC/ATCdisplay.hxx
View file

@ -76,7 +76,7 @@ public:
// Register a single message for display after a delay of delay seconds // Register a single message for display after a delay of delay seconds
// Will automatically stop displaying after a suitable interval. // Will automatically stop displaying after a suitable interval.
void RegisterSingleMessage(string msg, double delay = 0.0); // OK - I know passing a string in and out is probably not good but it will have to do for now. void RegisterSingleMessage(string msg, double delay); // OK - I know passing a string in and out is probably not good but it will have to do for now.
// For now we will assume only one repeating message at once // For now we will assume only one repeating message at once
// This is not really robust // This is not really robust

15
src/ATC/ATCmgr.cxx
View file

@ -103,9 +103,6 @@ void FGATCMgr::init() {
SGPath p_comm( globals->get_fg_root() ); SGPath p_comm( globals->get_fg_root() );
current_commlist->init( p_comm ); current_commlist->init( p_comm );
// Set the user callsign - bit of a hack at the moment - eventually should be read from aircraft file and user-over-rideable
fgSetString("/sim/user/callsign", "Golf Foxtrot Sierra"); // C-FGFS
#ifdef ENABLE_AUDIO_SUPPORT #ifdef ENABLE_AUDIO_SUPPORT
// Load all available voices. // Load all available voices.
// For now we'll do one hardwired one // For now we'll do one hardwired one
@ -143,8 +140,6 @@ void FGATCMgr::update(double dt) {
SG_LOG(SG_ATC, SG_WARN, "Warning - ATCMgr::update(...) called before ATCMgr::init()"); SG_LOG(SG_ATC, SG_WARN, "Warning - ATCMgr::update(...) called before ATCMgr::init()");
} }
current_atcdialog->Update(dt);
//cout << "Entering update..." << endl; //cout << "Entering update..." << endl;
//Traverse the list of active stations. //Traverse the list of active stations.
//Only update one class per update step to avoid the whole ATC system having to calculate between frames. //Only update one class per update step to avoid the whole ATC system having to calculate between frames.
@ -537,16 +532,16 @@ void FGATCMgr::FreqSearch(int channel) {
FGATC* app = FindInList(comm_ident[chan], TOWER); FGATC* app = FindInList(comm_ident[chan], TOWER);
if(app != NULL) { if(app != NULL) {
// The station is already in the ATC list // The station is already in the ATC list
cout << comm_ident[chan] << " is in list - flagging SetDisplay..." << endl; //cout << "In list - flagging SetDisplay..." << endl;
app->SetDisplay(); app->SetDisplay();
} else { } else {
// Generate the station and put in the ATC list // Generate the station and put in the ATC list
cout << comm_ident[chan] << " is not in list - generating..." << endl; //cout << "Not in list - generating..." << endl;
FGTower* t = new FGTower; FGTower* t = new FGTower;
t->SetData(&data); t->SetData(&data);
comm_atc_ptr[chan] = t; comm_atc_ptr[chan] = t;
t->Init();
t->SetDisplay(); t->SetDisplay();
t->Init();
atc_list.push_back(t); atc_list.push_back(t);
} }
} else if (comm_type[chan] == GROUND) { } else if (comm_type[chan] == GROUND) {
@ -561,8 +556,8 @@ void FGATCMgr::FreqSearch(int channel) {
FGGround* g = new FGGround; FGGround* g = new FGGround;
g->SetData(&data); g->SetData(&data);
comm_atc_ptr[chan] = g; comm_atc_ptr[chan] = g;
g->Init();
g->SetDisplay(); g->SetDisplay();
g->Init();
atc_list.push_back(g); atc_list.push_back(g);
} }
} else if (comm_type[chan] == APPROACH) { } else if (comm_type[chan] == APPROACH) {
@ -580,8 +575,8 @@ void FGATCMgr::FreqSearch(int channel) {
FGApproach* a = new FGApproach; FGApproach* a = new FGApproach;
a->SetData(&data); a->SetData(&data);
comm_atc_ptr[chan] = a; comm_atc_ptr[chan] = a;
a->Init();
a->SetDisplay(); a->SetDisplay();
a->Init();
a->AddPlane("Player"); a->AddPlane("Player");
atc_list.push_back(a); atc_list.push_back(a);
} }