Merge branch 'next' of D:\Git_New\flightgear into next

[flightgear.git] / src / Instrumentation / HUD / HUD.hxx

diff --git a/src/Instrumentation/HUD/HUD.hxx b/src/Instrumentation/HUD/HUD.hxx
index 50b81da68d91f32698aace917601f9cf69aeeecc..3408e54c58e55e8e58cf2620ed4c489e4b054eb4 100644 (file)
--- a/src/Instrumentation/HUD/HUD.hxx
+++ b/src/Instrumentation/HUD/HUD.hxx
@@ -153,6 +153,8 @@ public:
     void init();
     void update(double);
 
+  void reinit();
+
     // called from Main/renderer.cxx to draw 2D and 3D HUD
     void draw(osg::State&);
 
@@ -195,6 +197,8 @@ protected:
             int level = 0, const std::string& indent = "");
 
 private:
+    void deinit();
+    
     void draw3D();
     void draw2D(GLfloat, GLfloat, GLfloat, GLfloat);
 
@@ -595,7 +599,6 @@ private:
     double _default_heading;
     GLint  _view[4];
     FGRunway* _runway;
-    FGViewer* _cockpit_view;
     unsigned short _stipple_out;    // stipple pattern of the outline of the runway
     unsigned short _stipple_center; // stipple pattern of the center line of the runway
     bool   _draw_arrow;             // draw arrow when runway is not visible in HUD
@@ -623,7 +626,6 @@ private:
     Input  _t1;
     Input  _offset_x;
     Input  _offset_y;
-    bool _hasTachyInputs;
 
     float   _bullet_size;
     float   _inner_radius;