From dac00efbc75fd774bb0e6eb790aa868ab8ae3de4 Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Mon, 2 Jan 2012 23:13:51 +0100
Subject: [PATCH] Fix some compiler warnings. Comment out unused code.

---
 src/AIModel/AIShip.cxx              |  3 ++-
 src/FDM/YASim/Rotor.cpp             |  3 +++
 src/Instrumentation/KLN89/kln89.cxx |  6 ++++--
 src/Main/CameraGroup.cxx            |  7 ++++---
 src/Radio/itm.cpp                   |  7 ++++---
 src/Time/light.cxx                  | 13 ++++++-------
 6 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/AIModel/AIShip.cxx b/src/AIModel/AIShip.cxx
index df0ce649b..5cf94f19d 100644
--- a/src/AIModel/AIShip.cxx
+++ b/src/AIModel/AIShip.cxx
@@ -251,6 +251,7 @@ void FGAIShip::unbind() {
     props->untie("velocities/speed-kts");
 
 }
+
 void FGAIShip::update(double dt) {
     //SG_LOG(SG_AI, SG_ALERT, "updating Ship: " << _name <<hdg<<pitch<<roll);
     // For computation of rotation speeds we just use finite differences here.
@@ -265,7 +266,7 @@ void FGAIShip::update(double dt) {
     // local frame
     SGQuatd ec2body = ec2hl*hl2body;
     // The cartesian position of the ship in the wgs84 world
-    SGVec3d cartPos = SGVec3d::fromGeod(pos);
+    //SGVec3d cartPos = SGVec3d::fromGeod(pos);
 
     // The simulation time this transform is meant for
     aip.setReferenceTime(globals->get_sim_time_sec());
diff --git a/src/FDM/YASim/Rotor.cpp b/src/FDM/YASim/Rotor.cpp
index 1231cf6b8..79e5fd128 100644
--- a/src/FDM/YASim/Rotor.cpp
+++ b/src/FDM/YASim/Rotor.cpp
@@ -1543,6 +1543,8 @@ void Rotorgear::calcForces(float* torqueOut)
         }
         total_torque*=-1;
         _ddt_omegarel=0;
+
+#if 0
         float rel_torque_engine=1;
         if (total_torque<=0)
             rel_torque_engine=0;
@@ -1551,6 +1553,7 @@ void Rotorgear::calcForces(float* torqueOut)
                 rel_torque_engine=1/max_torque_of_engine*total_torque;
             else
                 rel_torque_engine=0;
+#endif
 
         //add the rotor brake and the gear fritcion
         float dt=0.1f;
diff --git a/src/Instrumentation/KLN89/kln89.cxx b/src/Instrumentation/KLN89/kln89.cxx
index c2212a99f..75e6a7f84 100644
--- a/src/Instrumentation/KLN89/kln89.cxx
+++ b/src/Instrumentation/KLN89/kln89.cxx
@@ -727,9 +727,11 @@ static double gps_min(const double &a, const double &b) {
 	return(a <= b ? a : b);
 }
 
+#if 0
 static double gps_max(const double &a, const double &b) {
 	return(a >= b ? a : b);
 }
+#endif
 
 void KLN89::UpdateMapHeading() {
 	switch(_mapOrientation) {
@@ -762,8 +764,8 @@ void KLN89::DrawMap(bool draw_avs) {
 	// TODO - use an aligned projection when either DTK or TK up!
 	FGATCAlignedProjection mapProj(SGGeod::fromRad(_gpsLon, _gpsLat), _mapHeading);
 	double meter_per_pix = (_mapOrientation == 0 ? mapScaleMeters / 20.0f : mapScaleMeters / 29.0f);
-	SGGeod bottomLeft = mapProj.ConvertFromLocal(SGVec3d(gps_max(-57.0 * meter_per_pix, -50000), gps_max((_mapOrientation == 0 ? -20.0 * meter_per_pix : -11.0 * meter_per_pix), -25000), 0.0));
-	SGGeod topRight = mapProj.ConvertFromLocal(SGVec3d(gps_min(54.0 * meter_per_pix, 50000), gps_min((_mapOrientation == 0 ? 20.0 * meter_per_pix : 29.0 * meter_per_pix), 25000), 0.0));
+//	SGGeod bottomLeft = mapProj.ConvertFromLocal(SGVec3d(gps_max(-57.0 * meter_per_pix, -50000), gps_max((_mapOrientation == 0 ? -20.0 * meter_per_pix : -11.0 * meter_per_pix), -25000), 0.0));
+//	SGGeod topRight = mapProj.ConvertFromLocal(SGVec3d(gps_min(54.0 * meter_per_pix, 50000), gps_min((_mapOrientation == 0 ? 20.0 * meter_per_pix : 29.0 * meter_per_pix), 25000), 0.0));
 
 
 
diff --git a/src/Main/CameraGroup.cxx b/src/Main/CameraGroup.cxx
index fccba809c..135c67604 100644
--- a/src/Main/CameraGroup.cxx
+++ b/src/Main/CameraGroup.cxx
@@ -456,9 +456,9 @@ static osg::Geometry* createParoramicSphericalDisplayDistortionMesh(
     bool flip = false;
     bool texcoord_flip = false;
 
+#if 0
     osg::Vec3d projector = eye - osg::Vec3d(0.0,0.0, distance);
 
-#if 0
     OSG_INFO<<"createParoramicSphericalDisplayDistortionMesh : Projector position = "<<projector<<std::endl;
     OSG_INFO<<"createParoramicSphericalDisplayDistortionMesh : distance = "<<distance<<std::endl;
 #endif
@@ -482,10 +482,11 @@ static osg::Geometry* createParoramicSphericalDisplayDistortionMesh(
     osg::Vec2Array* texcoords1 = intensityMap==0 ? new osg::Vec2Array : 0;
     osg::Vec4Array* colors = new osg::Vec4Array;
 
+#if 0
     osg::Vec3 bottom = origin;
     osg::Vec3 dx = xAxis*(width/((float)(noSteps-2)));
     osg::Vec3 dy = yAxis*(height/((float)(noSteps-1)));
-
+#endif
     osg::Vec3 top = origin + yAxis*height;
 
     osg::Vec3 screenCenter = origin + widthVector*0.5f + heightVector*0.5f;
@@ -495,7 +496,7 @@ static osg::Geometry* createParoramicSphericalDisplayDistortionMesh(
 
     for(int i=0;i<noSteps;++i)
     {
-        osg::Vec3 cursor = bottom+dy*(float)i;
+        //osg::Vec3 cursor = bottom+dy*(float)i;
         for(int j=0;j<noSteps;++j)
         {
             osg::Vec2 texcoord(double(i)/double(noSteps-1), double(j)/double(noSteps-1));
diff --git a/src/Radio/itm.cpp b/src/Radio/itm.cpp
index 8f75162ce..1ad10d4d8 100644
--- a/src/Radio/itm.cpp
+++ b/src/Radio/itm.cpp
@@ -1552,7 +1552,6 @@ void point_to_point(double elev[],
 	double zc, zr;
 	double q = eno;
 	long ja, jb, i, np;
-	double dkm, xkm;
 	double fs;
 
 	prop.h_g[0] = tht_m;          // Tx height above ground level
@@ -1564,8 +1563,10 @@ void point_to_point(double elev[],
 	zc = qerfi(conf);
 	zr = qerfi(rel);
 	np = (long)elev[0];
-	dkm = (elev[1] * elev[0]) / 1000.0;
-	xkm = elev[1] / 1000.0;
+#if 0
+	double dkm = (elev[1] * elev[0]) / 1000.0;
+	double xkm = elev[1] / 1000.0;
+#endif
 
 	ja = (long)(3.0 + 0.1 * elev[0]);
 	jb = np - ja + 6;
diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index d12d67049..2dfbbbc3c 100644
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -330,10 +330,10 @@ void FGLight::update_sky_color () {
 // calculate fog color adjusted for sunrise/sunset effects
 void FGLight::update_adj_fog_color () {
 
-    double pitch = globals->get_current_view()->getPitch_deg()
-                     * SGD_DEGREES_TO_RADIANS;
-    double pitch_offset = globals->get_current_view()-> getPitchOffset_deg()
-                     * SGD_DEGREES_TO_RADIANS;
+//    double pitch = globals->get_current_view()->getPitch_deg()
+//                     * SGD_DEGREES_TO_RADIANS;
+//    double pitch_offset = globals->get_current_view()-> getPitchOffset_deg()
+//                     * SGD_DEGREES_TO_RADIANS;
     double heading = globals->get_current_view()->getHeading_deg()
                      * SGD_DEGREES_TO_RADIANS;
     double heading_offset = globals->get_current_view()->getHeadingOffset_deg()
@@ -360,13 +360,12 @@ void FGLight::update_adj_fog_color () {
 	return;
     }
 
-    double hor_rotation, vert_rotation;
     static float gamma = system_gamma;
 
     // first determine the difference between our view angle and local
     // direction to the sun
-    vert_rotation = pitch + pitch_offset;
-    hor_rotation = -(_sun_rotation + SGD_PI) - heading + heading_offset;
+    //double vert_rotation = pitch + pitch_offset;
+    double hor_rotation = -(_sun_rotation + SGD_PI) - heading + heading_offset;
     if (hor_rotation < 0 )
        hor_rotation = fmod(hor_rotation, SGD_2PI) + SGD_2PI;
     else
-- 
2.39.5