Various tweaks.

diff --git a/configure.ac b/configure.ac
index 18ae4dc117f4bb8b37e25d19579c59ff1431ea8b..b8cf175bdfa610742a7a417b65679e66ef794cba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -163,6 +163,10 @@ case "${host}" in
 
 esac
 AC_SUBST(audio_LIBS)
+
+dnl ENABLE_AUDIO_SUPPORT could be depricated at any time in favor of
+dnl just assuming we have audio support on all platform.  We can
+dnl depend on plib to hide the details.
 AC_DEFINE([ENABLE_AUDIO_SUPPORT], 1, [Define for audio support])
 
 dnl X11 might be installed on Mac OS X or cygwin/mingwin, we don't want

diff --git a/src/Cockpit/marker_beacon.cxx b/src/Cockpit/marker_beacon.cxx
index 1a0d6f327c4e9882bb59fe6ab1332ea1928ee98e..1d353ace31fe71768c1274887a666be6acd72b28 100644 (file)
--- a/src/Cockpit/marker_beacon.cxx
+++ b/src/Cockpit/marker_beacon.cxx
@@ -40,31 +40,6 @@
 SG_USING_STD(string);
 
 
-/**
- * Boy, this is ugly!  Make the VOR range vary by altitude difference.
- */
-static double kludgeRange ( double stationElev, double aircraftElev,
-                           double nominalRange)
-{
-                               // Assume that the nominal range (usually
-                               // 50nm) applies at a 5,000 ft difference.
-                               // Just a wild guess!
-  double factor = ((aircraftElev*SG_METER_TO_FEET) - stationElev) / 5000.0;
-  double range = fabs(nominalRange * factor);
-
-                               // Clamp the range to keep it sane; for
-                               // now, never less than 25% or more than
-                               // 500% of nominal range.
-  if (range < nominalRange/4.0) {
-    range = nominalRange/4.0;
-  } else if (range > nominalRange*5.0) {
-    range = nominalRange*5.0;
-  }
-
-  return range;
-}
-
-
 // Constructor
 FGMarkerBeacon::FGMarkerBeacon() :
     lon_node(fgGetNode("/position/longitude-deg", true)),

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 12cad471d301b0255146c9175b0f10a5ed5b620a..b265e886da4e70c587bddfdd1d4b0563f8d0fab3 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -428,7 +428,7 @@ void trRenderFrame( void ) {
     ssgCullAndDraw( globals->get_scenery()->get_gnd_lights_root() );
 
     if (fgGetBool("/environment/clouds/status"))
-      thesky->postDraw( cur_fdm_state->get_Altitude() * SG_FEET_TO_METER );
+        thesky->postDraw( cur_fdm_state->get_Altitude() * SG_FEET_TO_METER );
 
     globals->get_model_mgr()->draw();
     globals->get_aircraft_model()->draw();
@@ -751,7 +751,7 @@ void fgRenderFrame() {
             glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, quadratic);
             glPointParameterfEXT(GL_POINT_SIZE_MIN_EXT, 1.0); 
        }
-        glPointSize(2.0);
+        glPointSize(4.0);
 
         // blending function for runway lights
         glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) ;
@@ -1683,8 +1683,8 @@ static bool fgMainInit( int argc, char **argv ) {
     texture_path.append("Textures");
     texture_path.append("Sky");
     for (int i = 0; i < FGEnvironmentMgr::MAX_CLOUD_LAYERS; i++) {
-      SGCloudLayer * layer = new SGCloudLayer(texture_path.str());
-      thesky->add_cloud_layer(layer);
+        SGCloudLayer * layer = new SGCloudLayer(texture_path.str());
+        thesky->add_cloud_layer(layer);
     }