More fg -> sg namespace changes in simgear.

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

diff --git a/src/FDM/Balloon.cxx b/src/FDM/Balloon.cxx
index ec6f6feed789aa18d80ce667c59e9af907e31ccd..9af965fb689d0da5de50abe54a9594b2e994663e 100644 (file)
--- a/src/FDM/Balloon.cxx
+++ b/src/FDM/Balloon.cxx
@@ -48,7 +48,7 @@ HISTORY
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Controls/controls.hxx>
@@ -77,15 +77,15 @@ FGBalloonSim::~FGBalloonSim() {
 void FGBalloonSim::init() {
     sgVec3 temp;
 
-    FG_LOG( FG_FLIGHT, FG_INFO, "Starting initializing BalloonSim" );
+    SG_LOG( SG_FLIGHT, SG_INFO, "Starting initializing BalloonSim" );
 
-    FG_LOG( FG_FLIGHT, FG_INFO, "  created a balloon" );
+    SG_LOG( SG_FLIGHT, SG_INFO, "  created a balloon" );
 
     //set position
     sgSetVec3( temp,
        get_Latitude(), 
        get_Longitude(), 
-       get_Altitude() * FEET_TO_METER);
+       get_Altitude() * SG_FEET_TO_METER);
     current_balloon.setPosition( temp );
 
     //set Euler angles (?)
@@ -102,7 +102,7 @@ void FGBalloonSim::init() {
               fgGetDouble("/velocities/wBody") );
     current_balloon.setVelocity( temp );
 
-    FG_LOG( FG_FLIGHT, FG_INFO, "Finished initializing BalloonSim" );
+    SG_LOG( SG_FLIGHT, SG_INFO, "Finished initializing BalloonSim" );
 }
 
 
@@ -121,7 +121,7 @@ bool FGBalloonSim::update( int multiloop ) {
     //not more implemented yet
 
     // Inform BalloonSim of the local terrain altitude
-    current_balloon.setGroundLevel ( get_Runway_altitude() * FEET_TO_METER);
+    current_balloon.setGroundLevel ( get_Runway_altitude() * SG_FEET_TO_METER);
 
     // old -- FGInterface_2_JSBsim() not needed except for Init()
     // translate FG to JSBsim structure
@@ -146,7 +146,7 @@ bool FGBalloonSim::update( int multiloop ) {
     /*sgVec3 temp, temp2;
     current_balloon.getPosition( temp );
     current_balloon.getVelocity( temp2 );
-    FG_LOG( FG_FLIGHT, FG_INFO, "T: " << current_balloon.getTemperature() <<
+    SG_LOG( SG_FLIGHT, SG_INFO, "T: " << current_balloon.getTemperature() <<
                                " alt: " << temp[2] <<
                                " gr_alt: " << get_Runway_altitude() << 
                                " burner: " << controls.get_elevator() <<
@@ -186,7 +186,7 @@ bool FGBalloonSim::copy_from_BalloonSim() {
     //temp[1]: longitude
     //temp[2]: altitude (meters)
 
-    _updatePosition( temp[0], temp[1], temp[2] * METER_TO_FEET  );
+    _updatePosition( temp[0], temp[1], temp[2] * SG_METER_TO_FEET  );
     
     current_balloon.getHPR( temp );
     set_Euler_Angles( temp[0], temp[1], temp[2] );