I forgot a linker dependency. It really si time to figure out why these are all needed.

[flightgear.git] / src / FDM / Balloon.cxx

diff --git a/src/FDM/Balloon.cxx b/src/FDM/Balloon.cxx
index 9af965fb689d0da5de50abe54a9594b2e994663e..9d7f19bad4d59d0664adb832b389187bf5ec2347 100644 (file)
--- a/src/FDM/Balloon.cxx
+++ b/src/FDM/Balloon.cxx
@@ -37,6 +37,10 @@ HISTORY
 /* INCLUDES                                                                */
 /****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
 
 #ifdef SG_MATH_EXCEPTION_CLASH
@@ -75,6 +79,12 @@ FGBalloonSim::~FGBalloonSim() {
 // Initialize the BalloonSim flight model, dt is the time increment for
 // each subsequent iteration through the EOM
 void FGBalloonSim::init() {
+               
+    //do init common to all the FDM's          
+    common_init();
+    
+    //now do init specific to the Balloon
+
     sgVec3 temp;
 
     SG_LOG( SG_FLIGHT, SG_INFO, "Starting initializing BalloonSim" );
@@ -97,9 +107,9 @@ void FGBalloonSim::init() {
 
     //set velocities
     sgSetVec3( temp,
-              fgGetDouble("/velocities/uBody"),
-              fgGetDouble("/velocities/vBody"),
-              fgGetDouble("/velocities/wBody") );
+              fgGetDouble("/sim/presets/uBody-fps"),
+              fgGetDouble("/sim/presets/vBody-fps"),
+              fgGetDouble("/sim/presets/wBody-fps") );
     current_balloon.setVelocity( temp );
 
     SG_LOG( SG_FLIGHT, SG_INFO, "Finished initializing BalloonSim" );
@@ -107,9 +117,14 @@ void FGBalloonSim::init() {
 
 
 // Run an iteration of the EOM (equations of motion)
-bool FGBalloonSim::update( int multiloop ) {
+void FGBalloonSim::update( double dt ) {
     double save_alt = 0.0;
 
+    if (is_suspended())
+      return;
+
+    int multiloop = _calc_multiloop(dt);
+
     // lets try to avoid really screwing up the BalloonSim model
     if ( get_Altitude() < -9000 ) {
        save_alt = get_Altitude();
@@ -117,7 +132,7 @@ bool FGBalloonSim::update( int multiloop ) {
     }
 
     // set control positions
-    current_balloon.set_burner_strength ( controls.get_throttle(0) );
+    current_balloon.set_burner_strength ( globals->get_controls()->get_throttle(0) );
     //not more implemented yet
 
     // Inform BalloonSim of the local terrain altitude
@@ -156,8 +171,6 @@ bool FGBalloonSim::update( int multiloop ) {
     if ( save_alt < -9000.0 ) {
        set_Altitude( save_alt );
     }
-
-    return true;
 }
 
 
@@ -186,7 +199,7 @@ bool FGBalloonSim::copy_from_BalloonSim() {
     //temp[1]: longitude
     //temp[2]: altitude (meters)
 
-    _updatePosition( temp[0], temp[1], temp[2] * SG_METER_TO_FEET  );
+    _updateGeocentricPosition( temp[0], temp[1], temp[2] * SG_METER_TO_FEET );
     
     current_balloon.getHPR( temp );
     set_Euler_Angles( temp[0], temp[1], temp[2] );