set /sim/fg-current to current working directory; getcwd() is defined in

[flightgear.git] / src / Main / viewmgr.cxx

diff --git a/src/Main/viewmgr.cxx b/src/Main/viewmgr.cxx
index e64f1d13f85fc6b23e9732b071e157684a3257c3..c67c71914e49402ddab4655d3440882f5d21bac2 100644 (file)
--- a/src/Main/viewmgr.cxx
+++ b/src/Main/viewmgr.cxx
@@ -40,6 +40,7 @@
 FGViewMgr::FGViewMgr( void ) :
   axis_long(0),
   axis_lat(0),
+  view_number(fgGetNode("/sim/current-view/view-number", true)),
   config_list(fgGetNode("/sim", true)->getChildren("view")),
   current(0)
 {
@@ -74,11 +75,11 @@ FGViewMgr::init ()
     double z_offset_m = n->getDoubleValue("config/z-offset-m");
 
     double heading_offset_deg = n->getDoubleValue("config/heading-offset-deg");
-    n->setDoubleValue(heading_offset_deg);
+    n->setDoubleValue("config/heading-offset-deg", heading_offset_deg);
     double pitch_offset_deg = n->getDoubleValue("config/pitch-offset-deg");
-    n->setDoubleValue(pitch_offset_deg);
+    n->setDoubleValue("config/pitch-offset-deg", pitch_offset_deg);
     double roll_offset_deg = n->getDoubleValue("config/roll-offset-deg");
-    n->setDoubleValue(roll_offset_deg);
+    n->setDoubleValue("config/roll-offset-deg", roll_offset_deg);
 
     double fov_deg = n->getDoubleValue("config/default-field-of-view-deg");
     double near_m = n->getDoubleValue("config/ground-level-nearplane-m");
@@ -561,20 +562,20 @@ FGViewMgr::setView (int newview)
   // negative numbers -> set view with node index -newview
   if (newview < 0) {
     for (int i = 0; i < (int)config_list.size(); i++) {
-        int index = -config_list[i]->getIndex();
-        if (index == newview)
-            newview = i;
+      int index = -config_list[i]->getIndex();
+      if (index == newview)
+        newview = i;
     }
     if (newview < 0)
-        return;
+      return;
   }
 
   // if newview number too low wrap to last view...
   if (newview < 0)
-    newview = (int)views.size() -1;
+    newview = (int)views.size() - 1;
 
   // if newview number to high wrap to zero...
-  if (newview > ((int)views.size() -1))
+  if (newview >= (int)views.size())
     newview = 0;
 
   // set new view