fly/flightgear
1
0
Fork 0
Code Activity

Properly compile kln89 code without reliance on ATCDCL.

Browse source
This commit is contained in:
Durk Talsma 2010-07-31 13:35:22 +02:00
parent ab09078767
commit 314f3c5718
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/ATC/atcutils.hxx
View file

@ -52,7 +52,8 @@
#if !ENABLE_ATCDCL #if !ENABLE_ATCDCL
class SGPath; class SGPath;
struct ATCData;
// Possible types of ATC type that the radios may be tuned to. // Possible types of ATC type that the radios may be tuned to.
// INVALID implies not tuned in to anything. // INVALID implies not tuned in to anything.
@ -67,6 +68,18 @@ enum atc_type {
INVALID /* must be last element; see ATC_NUM_TYPES */ INVALID /* must be last element; see ATC_NUM_TYPES */
}; };
struct ATCData {
ATCData() : type(INVALID), cart(0, 0, 0), freq(0), range(0) {}
atc_type type;
SGGeod geod;
SGVec3d cart;
unsigned short int freq;
unsigned short int range;
std::string ident;
std::string name;
};
// A list of ATC stations // A list of ATC stations
typedef std::list < ATCData > comm_list_type; typedef std::list < ATCData > comm_list_type;

6
src/Instrumentation/KLN89/kln89_page_apt.cxx
View file

@ -26,7 +26,11 @@
#endif #endif
#include "kln89_page_apt.hxx" #include "kln89_page_apt.hxx"
#include <ATCDCL/commlist.hxx> #if ENABLE_ATCDCL
# include <ATCDCL/commlist.hxx>
#else
#include <ATC/atcutils.hxx>
#endif
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Airports/runways.hxx> #include <Airports/runways.hxx>
#include <Airports/simple.hxx> #include <Airports/simple.hxx>