Merge commit 'refs/merge-requests/1552' of git@gitorious.org:fg/flightgear into next

[flightgear.git] / src / Cockpit / cockpit.hxx

diff --git a/src/Cockpit/cockpit.hxx b/src/Cockpit/cockpit.hxx
index 5873cd67ed405dc0f8c6705767b2162fcf243050..91c4155142ccb412ba3408e6c0f2e348e0dcf484 100644 (file)
--- a/src/Cockpit/cockpit.hxx
+++ b/src/Cockpit/cockpit.hxx
@@ -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$
  **************************************************************************/
@@ -31,28 +31,9 @@
 # error This library requires C++
 #endif
 
+#include <osg/State>
 
-#include "hud.hxx"
-#include "panel.hxx"
-
-// Class fg_Cockpit          This class is a holder for the heads up display
-//                          and is initialized with a
-class fg_Cockpit  {
-  private:
-    int  Code;
-    int  cockpitStatus;
-
-  public:
-    fg_Cockpit   () : Code(1), cockpitStatus(0) {};
-    int   code  ( void ) { return Code; }
-    int   status( void ) { return cockpitStatus; }
-};
-
-
-typedef fg_Cockpit * pCockpit;
-
-bool fgCockpitInit( fgAIRCRAFT *cur_aircraft );
-void fgCockpitUpdate( void );
-
+bool fgCockpitInit();
+void fgCockpitUpdate( osg::State* );
 
 #endif /* _COCKPIT_HXX */