commradio: improvements for atis speech

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

diff --git a/src/AIModel/AIWingman.cxx b/src/AIModel/AIWingman.cxx
index 6842c0916a712cf2f92d475351912d247b57d94a..7c14789971ae5079450a561e306e0f2180eee8a7 100644 (file)
--- a/src/AIModel/AIWingman.cxx
+++ b/src/AIModel/AIWingman.cxx
@@ -22,7 +22,6 @@
 #endif
 
 #include <simgear/sg_inlines.h>
-#include <simgear/math/SGMath.hxx>
 
 
 #include "AIWingman.hxx"
@@ -254,12 +253,11 @@ void FGAIWingman::formateToAC(double dt){
         setOffsetPos(_parentpos, p_hdg, p_pch, p_rll);
         setSpeed(_p_spd_node->getDoubleValue());
     }else {
-        _setUserPos();
         p_hdg = manager->get_user_heading();
         p_pch = manager->get_user_pitch();
         p_rll = manager->get_user_roll();
-        p_ht  = manager->get_user_altitude();
-        setOffsetPos(userpos, p_hdg,p_pch, p_rll);
+        p_ht  = globals->get_aircraft_position().getElevationFt();
+        setOffsetPos(globals->get_aircraft_position(), p_hdg,p_pch, p_rll);
         setSpeed(manager->get_user_speed());
     }
 
@@ -352,11 +350,10 @@ void FGAIWingman::Join(double dt) {
         parent_hdg = _p_hdg_node->getDoubleValue();
         parent_spd = _p_spd_node->getDoubleValue();
     }else {
-        _setUserPos();
         p_hdg = manager->get_user_heading();
         p_pch = manager->get_user_pitch();
         p_rll = manager->get_user_roll();
-        setOffsetPos(userpos, p_hdg, p_pch, p_rll);
+        setOffsetPos(globals->get_aircraft_position(), p_hdg, p_pch, p_rll);
         parent_hdg = manager->get_user_heading();
         parent_spd = manager->get_user_speed();
     }