Merge branch 'next' of git://gitorious.org/fg/flightgear into next

[flightgear.git] / src / AIModel / AITanker.cxx

diff --git a/src/AIModel/AITanker.cxx b/src/AIModel/AITanker.cxx
index 5d5d72a5b24888c331e919d5ad9c30757d81658a..ab7c8ed6dd7a240364977fb6b90020112c5b603f 100644 (file)
--- a/src/AIModel/AITanker.cxx
+++ b/src/AIModel/AITanker.cxx
@@ -35,20 +35,26 @@ void FGAITanker::readFromScenario(SGPropertyNode* scFileNode) {
         return;
 
     FGAIAircraft::readFromScenario(scFileNode);
-    setTACANChannelID(scFileNode->getStringValue("TACAN-channel-ID"));
+    setTACANChannelID(scFileNode->getStringValue("TACAN-channel-ID",""));
+    setName(scFileNode->getStringValue("name", "Tanker"));
+
 }
 
 void FGAITanker::bind() {
     FGAIAircraft::bind();
 
     props->tie("refuel/contact", SGRawValuePointer<bool>(&contact));
+    props->tie("position/altitude-agl-ft",SGRawValuePointer<double>(&altitude_agl_ft));
     props->setStringValue("navaids/tacan/channel-ID", TACAN_channel_id.c_str());
+    props->setStringValue("name", _name.c_str());
     props->setBoolValue("tanker", true);
 }
 
 void FGAITanker::unbind() {
     FGAIAircraft::unbind();
     props->untie("refuel/contact");
+    props->untie("position/altitude-agl-ft");
+
 }
 
 void FGAITanker::setTACANChannelID(const string& id) {
@@ -56,7 +62,10 @@ void FGAITanker::setTACANChannelID(const string& id) {
 }
 
 void FGAITanker::Run(double dt) {
-    FGAIAircraft::Run(dt);
+    //FGAIAircraft::Run(dt);
+
+    double start = pos.getElevationFt() + 1000;
+    altitude_agl_ft = _getAltitudeAGL(pos, start);
 
     //###########################//
     // do calculations for radar //
@@ -79,4 +88,4 @@ void FGAITanker::update(double dt) {
      FGAIAircraft::update(dt);
      Run(dt);
      Transform();
-}
\ No newline at end of file
+}