From: curt <curt>
Date: Fri, 16 Mar 2001 23:59:02 +0000 (+0000)
Subject: Initial support for marker beacons.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a695a8d9f5316a659a28cf0d09daba8577c621b6;p=flightgear.git

Initial support for marker beacons.
---

diff --git a/FlightGear.dsp b/FlightGear.dsp
index 77273ffc4..e551a2f0d 100644
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -2482,6 +2482,21 @@ SOURCE=.\src\Navaids\ilslist.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\Navaids\mkrbeacons.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Navaids"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Navaids"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\Navaids\navlist.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index 86e1b80b1..7ee37c141 100644
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.cxx
@@ -26,6 +26,7 @@
 #include <Aircraft/aircraft.hxx>
 #include <Main/bfi.hxx>
 #include <Navaids/ilslist.hxx>
+#include <Navaids/mkrbeacons.hxx>
 #include <Navaids/navlist.hxx>
 #include <Time/event.hxx>
 
@@ -800,6 +801,22 @@ void FGRadioStack::search()
 	// cout << "not picking up vor1. :-(" << endl;
     }
 
+    FGBeacon::fgMkrBeacType beacon_type
+	= current_beacons->query( lon * RAD_TO_DEG, lat * RAD_TO_DEG, elev );
+
+    outer_marker = middle_marker = inner_marker = false;
+
+    if ( beacon_type == FGBeacon::OUTER ) {
+	outer_marker = true;
+	cout << "OUTER MARKER" << endl;
+    } else if ( beacon_type == FGBeacon::MIDDLE ) {
+	middle_marker = true;
+	cout << "MIDDLE MARKER" << endl;
+    } else if ( beacon_type == FGBeacon::INNER ) {
+	inner_marker = true;
+	cout << "INNER MARKER" << endl;
+    }
+
     // adf
     if ( current_navlist->query( lon, lat, elev, adf_freq, &nav ) ) {
 	char freq[128];
diff --git a/src/Cockpit/radiostack.hxx b/src/Cockpit/radiostack.hxx
index e0bda36c6..aea29ab70 100644
--- a/src/Cockpit/radiostack.hxx
+++ b/src/Cockpit/radiostack.hxx
@@ -127,6 +127,10 @@ class FGRadioStack : public FGSubsystem
     double nav2_vol_btn;
     bool nav2_ident_btn;
 
+    bool outer_marker;
+    bool middle_marker;
+    bool inner_marker;
+
     string adf_ident;
     string adf_trans_ident;
     bool adf_valid;
diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index f2cb1d277..3f330270e 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -76,6 +76,7 @@
 #include <Objects/matlib.hxx>
 #include <Navaids/fixlist.hxx>
 #include <Navaids/ilslist.hxx>
+#include <Navaids/mkrbeacons.hxx>
 #include <Navaids/navlist.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
@@ -698,7 +699,9 @@ bool fgInitSubsystems( void ) {
     p_nav.append( "Navaids/default.nav" );
     current_navlist->init( p_nav );
 
-    FG_LOG(FG_GENERAL, FG_INFO, "  ILS");
+    FG_LOG(FG_GENERAL, FG_INFO, "  ILS and Marker Beacons");
+    current_beacons = new FGMarkerBeacons;
+    current_beacons->init();
     current_ilslist = new FGILSList;
     FGPath p_ils( globals->get_fg_root() );
     p_ils.append( "Navaids/default.ils" );