Multiplayer client/server system -- MessageBuf class and test harness complete

[flightgear.git] / src / ATC / AIPlane.cxx

diff --git a/src/ATC/AIPlane.cxx b/src/ATC/AIPlane.cxx
index 5ce556b472705ca157670acf127749eacf8c2729..3594e5e70f82a02d98d946807afff684f9404057 100644 (file)
--- a/src/ATC/AIPlane.cxx
+++ b/src/ATC/AIPlane.cxx
@@ -37,7 +37,7 @@ FGAIPlane::FGAIPlane() {
        pending_transmission = "";
        _timeout = 0;
        _pending = false;
-       _callback = NULL;
+       _callback_code = 0;
        _transmit = false;
        _transmitting = false;
        voice = false;
@@ -52,7 +52,8 @@ FGAIPlane::~FGAIPlane() {
 void FGAIPlane::Update(double dt) {
        if(_pending) {
                if(tuned_station) {
-                       if(tuned_station->FreqClear()) {
+                       if(tuned_station->GetFreqClear()) {
+                               tuned_station->SetFreqInUse();
                                _pending = false;
                                _transmit = true;
                                _transmitting = false;
@@ -77,26 +78,36 @@ void FGAIPlane::Update(double dt) {
        // This turns on rendering if on the same freq as the user
        // TODO - turn it off if user switches to another freq - keep track of where in message we are etc.
        if(_transmit) {
+               //cout << "transmit\n";
                double user_freq0 = fgGetDouble("/radios/comm[0]/frequencies/selected-mhz");
-               //comm1 is not used yet.
+               double user_freq1 = fgGetDouble("/radios/comm[1]/frequencies/selected-mhz");
                _counter = 0.0;
                _max_count = 5.0;               // FIXME - hardwired length of message - need to calculate it!
                
-               if(freq == user_freq0) {
+               //cout << "Transmission = " << pending_transmission << '\n';
+               if(freq == user_freq0 || freq == user_freq1) {
                        //cout << "Transmitting..." << endl;
                        // we are on the same frequency, so check distance to the user plane
                        if(1) {
                                // For now assume in range !!!
                                // TODO - implement range checking
                                Render(plane.callsign, false);
-                               _transmit = false;
-                               _transmitting = true;
                        }
                }
+               // Run the callback regardless of whether on same freq as user or not.
+               //cout << "_callback_code = " << _callback_code << '\n';
+               if(_callback_code) {
+                       ProcessCallback(_callback_code);
+               }
+               _transmit = false;
+               _transmitting = true;
        } else if(_transmitting) {
                if(_counter >= _max_count) {
                        NoRender(plane.callsign);
                        _transmitting = false;
+                       // For now we'll let ATC decide whether to respond
+                       //if(tuned_station) tuned_station->SetResponseReqd(plane.callsign);
+                       if(tuned_station) tuned_station->NotifyTransmissionFinished(plane.callsign);
                }
                _counter += dt;
        }
@@ -117,27 +128,31 @@ void FGAIPlane::LevelWings(void) {
        }
 }
 
-void FGAIPlane::Transmit(ai_plane_callback_t callback) {
+void FGAIPlane::Transmit(int callback_code) {
        SG_LOG(SG_ATC, SG_INFO, "Transmit called for plane " << plane.callsign << ", msg = " << pending_transmission);
        _pending = true;
-       _callback = callback;
+       _callback_code = callback_code;
        _timeout = 0.0;
 }
 
-void FGAIPlane::Transmit(double timeout, ai_plane_callback_t callback) {
+void FGAIPlane::ConditionalTransmit(double timeout, int callback_code) {
        SG_LOG(SG_ATC, SG_INFO, "Timed transmit called for plane " << plane.callsign << ", msg = " << pending_transmission);
        _pending = true;
-       _callback = callback;
+       _callback_code = callback_code;
        _timeout = timeout;
 }
 
-void FGAIPlane::ImmediateTransmit(ai_plane_callback_t callback) {
+void FGAIPlane::ImmediateTransmit(int callback_code) {
        Render(plane.callsign, false);
-       if(_callback) {
-               (*_callback)();
+       if(callback_code) {
+               ProcessCallback(callback_code);
        }
 }
 
+// Derived classes should override this.
+void FGAIPlane::ProcessCallback(int code) {
+}
+
 // Render a transmission
 // Outputs the transmission either on screen or as audio depending on user preference
 // The refname is a string to identify this sample to the sound manager