From 9f41ee414f245205b765a65799d8313dbc8fcd28 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Wed, 12 Oct 2011 11:06:01 +0200 Subject: [PATCH] Join duplicate fields ident and trans_ident in navrecord --- src/Navaids/navrecord.cxx | 3 +-- src/Navaids/navrecord.hxx | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Navaids/navrecord.cxx b/src/Navaids/navrecord.cxx index 8c01c6a10..d30635303 100644 --- a/src/Navaids/navrecord.cxx +++ b/src/Navaids/navrecord.cxx @@ -52,8 +52,7 @@ FGNavRecord::FGNavRecord(Type aTy, const std::string& aIdent, multiuse(aMultiuse), _name(aName), mRunway(NULL), - serviceable(true), - trans_ident(aIdent) + serviceable(true) { initAirportRelation(); diff --git a/src/Navaids/navrecord.hxx b/src/Navaids/navrecord.hxx index f58d5a167..a77896caf 100644 --- a/src/Navaids/navrecord.hxx +++ b/src/Navaids/navrecord.hxx @@ -50,7 +50,6 @@ class FGNavRecord : public FGPositioned FGRunway* mRunway; // associated runway, if there is one bool serviceable; // for failure modeling - std::string trans_ident; // for failure modeling /** * 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 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 { return _name; }