Fix a build order problem.

[simgear.git] / simgear / sky / sky.cxx

diff --git a/simgear/sky/sky.cxx b/simgear/sky/sky.cxx
index 70a74586e32922ea63e0a1f63f056f023604921c..a3f756be54dbae65f77eaaa1a6da09b83dcfbafc 100644 (file)
--- a/simgear/sky/sky.cxx
+++ b/simgear/sky/sky.cxx
@@ -30,7 +30,7 @@
 #include <plib/sg.h>
 #include <plib/ssg.h>
 
-#include <simgear/math/fg_random.h>
+#include <simgear/math/sg_random.h>
 
 #include "sky.hxx"
 
@@ -193,8 +193,10 @@ void SGSky::postDraw( float alt ) {
 
     int in_cloud = -1;         // cloud we are in
 
+    int i;
+
     // check where we are relative to the cloud layers
-    for ( int i = 0; i < (int)cloud_layers.size(); ++i ) {
+    for ( i = 0; i < (int)cloud_layers.size(); ++i ) {
        float asl = cloud_layers[i]->get_asl();
        float thickness = cloud_layers[i]->get_thickness();
 
@@ -220,14 +222,14 @@ void SGSky::postDraw( float alt ) {
 
     if ( pos == 0 ) {
        // we are below all the cloud layers, draw top to bottom
-       for ( int i = cloud_layers.size() - 1; i >= 0; --i ) {
+       for ( i = cloud_layers.size() - 1; i >= 0; --i ) {
            if ( i != in_cloud ) {
                cloud_layers[i]->draw();
            }
        }
     } else if ( pos >= (int)cloud_layers.size() ) {
        // we are above all the cloud layers, draw bottom to top
-       for ( int i = 0; i < (int)cloud_layers.size(); ++i ) {
+       for ( i = 0; i < (int)cloud_layers.size(); ++i ) {
            if ( i != in_cloud ) {
                cloud_layers[i]->draw();
            }
@@ -235,12 +237,12 @@ void SGSky::postDraw( float alt ) {
     } else {
        // we are between cloud layers, draw lower layers bottom to
        // top and upper layers top to bottom
-       for ( int i = 0; i < pos; ++i ) {
+       for ( i = 0; i < pos; ++i ) {
            if ( i != in_cloud ) {
                cloud_layers[i]->draw();
            }
        }
-       for ( int i = cloud_layers.size() - 1; i >= pos; --i ) {
+       for ( i = cloud_layers.size() - 1; i >= pos; --i ) {
            if ( i != in_cloud ) {
                cloud_layers[i]->draw();
            }
@@ -326,11 +328,11 @@ void SGSky::modify_vis( float alt, float time_factor ) {
        if ( ratio < 1.0 ) {
            if ( ! in_puff ) {
                // calc chance of entering cloud puff
-               double rnd = fg_random();
+               double rnd = sg_random();
                double chance = rnd * rnd * rnd;
                if ( chance > 0.95 /* * (diff - 25) / 50.0 */ ) {
                    in_puff = true;
-                   puff_length = fg_random() * 2.0; // up to 2 seconds
+                   puff_length = sg_random() * 2.0; // up to 2 seconds
                    puff_progression = 0.0;
                }
            }