Miscellaneous tweaks and Bugfixes. Mostly memory leaks ported from the plib

[flightgear.git] / src / GUI / sgVec3Slider.cxx

diff --git a/src/GUI/sgVec3Slider.cxx b/src/GUI/sgVec3Slider.cxx
index 4c1b469e751a0e1311f1dba8ca1e6d6f29e20084..a2c133eb3cfc71c477272544f040296da394282c 100644 (file)
--- a/src/GUI/sgVec3Slider.cxx
+++ b/src/GUI/sgVec3Slider.cxx
@@ -16,6 +16,45 @@
 #include <Main/fg_props.hxx>
 #include <simgear/sg_inlines.h>
 
+static void
+setPilotXOffset (float value)
+{
+       PilotOffsetSet(0, value);
+}
+
+static float
+getPilotXOffset ()
+{
+       return( PilotOffsetGetSetting(0) );
+}
+
+
+static void
+setPilotYOffset (float value)
+{
+       PilotOffsetSet(1, value);
+}
+
+static float
+getPilotYOffset ()
+{
+       return( PilotOffsetGetSetting(1) );
+}
+
+
+static void
+setPilotZOffset (float value)
+{
+       PilotOffsetSet(2, value);
+}
+
+static float
+getPilotZOffset ()
+{
+       return( PilotOffsetGetSetting(2) );
+}
+
+
 class FloatSlider : public puSlider
 {
 
@@ -460,17 +499,6 @@ void PilotOffsetInit( sgVec3 cart )
        }
 }
 
-void PilotOffsetAdjust( puObject * )
-{
-       if( PO_vec == 0 ) {
-               PilotOffsetInit();
-       }
-       sgVec3Slider *me = (sgVec3Slider *)PO_vec -> getUserData();
-       me -> adjust( me );
-       me -> stashVec();
-       FG_PUSH_PUI_DIALOG( me );
-}
-
 // external to get pilot offset vector for viewer
 sgVec3 *PilotOffsetGet()
 {
@@ -484,9 +512,9 @@ sgVec3 *PilotOffsetGet()
 // external function used to tie to FG properties
 float PilotOffsetGetSetting(int opt)
 {
-       float setting;
+       float setting = 0.0;
        if( PO_vec == 0 ) {
-               PilotOffsetInit();
+            PilotOffsetInit();
        }
        sgVec3Slider *me = (sgVec3Slider *)PO_vec -> getUserData();
         sgVec3 vec;
@@ -576,7 +604,7 @@ void HeadingPitchRadiusFromVec3 ( sgVec3 hpr, sgVec3 vec3 )
     hpr[2] = 0;
   } else {
     if (fabs(y) < 0.001f)
-      y == 0.001f;
+      y = 0.001f;
 
     Zx = sqrt(y*y + z*z);