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

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

diff --git a/src/Aircraft/aircraft.hxx b/src/Aircraft/aircraft.hxx
index 1ef175ad1942f1e7bceefddb3ca9dd0c2c78967d..95763b017c0f3326b904ea0c5b08a0632ad3fad8 100644 (file)
--- a/src/Aircraft/aircraft.hxx
+++ b/src/Aircraft/aircraft.hxx
@@ -3,7 +3,7 @@
 //
 // Written by Curtis Olson, started May 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -17,7 +17,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 //*************************************************************************/
@@ -25,20 +25,14 @@
 
 #ifndef _AIRCRAFT_HXX
 #define _AIRCRAFT_HXX
-
-
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
-
-
-#include <FDM/flight.hxx>
-#include <Controls/controls.hxx>
-
+                                 
+class FGInterface;
+class FGControls;
+class SGPropertyNode;
 
 // Define a structure containing all the parameters for an aircraft
 typedef struct{
-    FGInterface   *fdm_state;
+    FGInterface *fdm_state;
     FGControls *controls;
 } fgAIRCRAFT ;
 
@@ -56,6 +50,9 @@ void fgAircraftInit( void );
 void fgAircraftOutputCurrent(fgAIRCRAFT *a);
 
 
-#endif // _AIRCRAFT_HXX
+// Read the list of available aircraft into to property tree
+void fgReadAircraft(void);
+bool fgLoadAircraft (const SGPropertyNode * arg);
 
+#endif // _AIRCRAFT_HXX