fly/flightgear
1
0
Fork 0
Code Activity

Join duplicate fields ident and trans_ident in navrecord

Browse source
This commit is contained in:
Torsten Dreyer 2011-10-12 11:06:01 +02:00
parent 8986c3488d
commit 9f41ee414f
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Navaids/navrecord.cxx
View file

@ -52,8 +52,7 @@ FGNavRecord::FGNavRecord(Type aTy, const std::string& aIdent,
multiuse(aMultiuse), multiuse(aMultiuse),
_name(aName), _name(aName),
mRunway(NULL), mRunway(NULL),
serviceable(true), serviceable(true)
trans_ident(aIdent)
{ {
initAirportRelation(); initAirportRelation();

3
src/Navaids/navrecord.hxx
View file

@ -50,7 +50,6 @@ class FGNavRecord : public FGPositioned
FGRunway* mRunway; // associated runway, if there is one FGRunway* mRunway; // associated runway, if there is one
bool serviceable; // for failure modeling bool serviceable; // for failure modeling
std::string trans_ident; // for failure modeling
/** /**
* Helper to init data when a navrecord is associated with an airport * Helper to init data when a navrecord is associated with an airport
@ -79,7 +78,7 @@ public:
inline const char *get_ident() const { return ident().c_str(); } inline const char *get_ident() const { return ident().c_str(); }
inline bool get_serviceable() const { return serviceable; } inline bool get_serviceable() const { return serviceable; }
inline const char *get_trans_ident() const { return trans_ident.c_str(); } inline const char *get_trans_ident() const { return get_ident(); }
virtual const std::string& name() const virtual const std::string& name() const
{ return _name; } { return _name; }