From e07b153321b6a4d881f06fcbadce78d3e5694edc Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Sun, 9 Nov 2003 00:46:56 +0000
Subject: [PATCH] Someone managed to commit changes as cvsguest, return to the
 original version.  These changes need to be added via the proper channels.

---
 src/ATC/ATCdisplay.hxx |  2 +-
 src/ATC/ATCmgr.cxx     | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/ATC/ATCdisplay.hxx b/src/ATC/ATCdisplay.hxx
index 0734e446f..c41bb72f8 100644
--- a/src/ATC/ATCdisplay.hxx
+++ b/src/ATC/ATCdisplay.hxx
@@ -76,7 +76,7 @@ public:
 
     // Register a single message for display after a delay of delay seconds
     // 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
     // This is not really robust
diff --git a/src/ATC/ATCmgr.cxx b/src/ATC/ATCmgr.cxx
index 22e2f6610..2056fcce7 100644
--- a/src/ATC/ATCmgr.cxx
+++ b/src/ATC/ATCmgr.cxx
@@ -102,9 +102,6 @@ void FGATCMgr::init() {
     current_commlist = new FGCommList;
     SGPath p_comm( globals->get_fg_root() );
     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	
 	// Load all available voices.
@@ -143,8 +140,6 @@ void FGATCMgr::update(double dt) {
 		SG_LOG(SG_ATC, SG_WARN, "Warning - ATCMgr::update(...) called before ATCMgr::init()");
 	}
 	
-	current_atcdialog->Update(dt);
-	
 	//cout << "Entering update..." << endl;
 	//Traverse the list of active stations.
 	//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);
 			if(app != NULL) {
 				// 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();
 			} else {
 				// 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;
 				t->SetData(&data);
 				comm_atc_ptr[chan] = t;
-				t->Init();
 				t->SetDisplay();
+				t->Init();
 				atc_list.push_back(t);
 			}
 		}  else if (comm_type[chan] == GROUND) {
@@ -561,8 +556,8 @@ void FGATCMgr::FreqSearch(int channel) {
 				FGGround* g = new FGGround;
 				g->SetData(&data);
 				comm_atc_ptr[chan] = g;
-				g->Init();
 				g->SetDisplay();
+				g->Init();
 				atc_list.push_back(g);
 			}
 		} else if (comm_type[chan] == APPROACH) {
@@ -580,8 +575,8 @@ void FGATCMgr::FreqSearch(int channel) {
 				FGApproach* a = new FGApproach;
 				a->SetData(&data);
 				comm_atc_ptr[chan] = a;
-				a->Init();
 				a->SetDisplay();
+				a->Init();
 				a->AddPlane("Player");
 				atc_list.push_back(a);
 			}