- adjusted for no-value constructor for FGPanel

[flightgear.git] / src / Aircraft / aircraft.cxx

diff --git a/src/Aircraft/aircraft.cxx b/src/Aircraft/aircraft.cxx
index e48aefbb68379b5586fbf67186de2dd888b904c6..08bcaf8daadf07c67e69cebbceb178e15e514897 100644 (file)
--- a/src/Aircraft/aircraft.cxx
+++ b/src/Aircraft/aircraft.cxx
@@ -23,9 +23,10 @@
 
 #include <stdio.h>
 
+#include <simgear/constants.h>
+#include <simgear/debug/logstream.hxx>
+
 #include "aircraft.hxx"
-#include <Debug/logstream.hxx>
-#include <Include/fg_constants.h>
 
 // This is a record containing all the info for the aircraft currently
 // being operated
@@ -34,9 +35,9 @@ fgAIRCRAFT current_aircraft;
 
 // Initialize an Aircraft structure
 void fgAircraftInit( void ) {
-    FG_LOG( FG_AIRCRAFT, FG_INFO, "Initializing Aircraft structure" );
+    SG_LOG( SG_AIRCRAFT, SG_INFO, "Initializing Aircraft structure" );
 
-    current_aircraft.fdm_state   = &cur_fdm_state;
+    current_aircraft.fdm_state   = cur_fdm_state;
     current_aircraft.controls = &controls;
 }
 
@@ -47,17 +48,17 @@ void fgAircraftOutputCurrent(fgAIRCRAFT *a) {
 
     f = a->fdm_state;
 
-    FG_LOG( FG_FLIGHT, FG_DEBUG,
-           "Pos = ("
-           << (f->get_Longitude() * 3600.0 * RAD_TO_DEG) << "," 
-           << (f->get_Latitude()  * 3600.0 * RAD_TO_DEG) << ","
+    SG_LOG( SG_FLIGHT, SG_DEBUG,
+            "Pos = ("
+           << (f->get_Longitude() * 3600.0 * SGD_RADIANS_TO_DEGREES) << "," 
+           << (f->get_Latitude()  * 3600.0 * SGD_RADIANS_TO_DEGREES) << ","
            << f->get_Altitude() 
            << ")  (Phi,Theta,Psi)=("
            << f->get_Phi() << "," 
            << f->get_Theta() << "," 
            << f->get_Psi() << ")" );
 
-    FG_LOG( FG_FLIGHT, FG_DEBUG,
+    SG_LOG( SG_FLIGHT, SG_DEBUG,
            "Kts = " << f->get_V_equiv_kts() 
            << "  Elev = " << controls.get_elevator() 
            << "  Aileron = " << controls.get_aileron()