ignore resets for now because every z/Z key press would trigger a call to NOAA. We...

[flightgear.git] / src / Model / acmodel.cxx

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index 90a70f8f6bc158d5912f7a72addc90e9d6cd9cb5..e209416c90940f80080746ebd43ec1d9d81545e3 100644 (file)
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -14,13 +14,14 @@
 
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/scene/model/placement.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
+#include <Main/viewer.hxx>
 #include <Scenery/scenery.hxx>
 
 #include "model_panel.hxx"
@@ -38,7 +39,7 @@ FGAircraftModel::FGAircraftModel ()
     _selector(new ssgSelector),
     _scene(new ssgRoot),
     _nearplane(0.01f),
-    _farplane(100.0f)
+    _farplane(1000.0f)
 {
 }
 
@@ -91,8 +92,9 @@ void
 FGAircraftModel::update (double dt)
 {
   int view_number = globals->get_viewmgr()->get_current();
+  int is_internal = globals->get_current_view()->getInternal();
 
-  if (view_number == 0 && !fgGetBool("/sim/view/internal")) {
+  if (view_number == 0 && !is_internal) {
     _aircraft->setVisible(false);
   } else {
     _aircraft->setVisible(true);
@@ -114,8 +116,8 @@ FGAircraftModel::draw ()
                                // OK, now adjust the clip planes and draw
                                // FIXME: view number shouldn't be 
                                // hard-coded.
-  int view_number = globals->get_viewmgr()->get_current();
-  if (_aircraft->getVisible() && view_number == 0) {
+  bool is_internal = globals->get_current_view()->getInternal();
+  if (_aircraft->getVisible() && is_internal) {
     glClearDepth(1);
     glClear(GL_DEPTH_BUFFER_BIT);
     ssgSetNearFar(_nearplane, _farplane);