Fixed a lot of warnings

[lugaru.git] / Source / Terrain.cpp

diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp
index b09f806296404c569cd3ad88e5ad2488fe81fcfe..b010bd52d58435cf2c569b0480d6f41035c76b24 100644 (file)
--- a/Source/Terrain.cpp
+++ b/Source/Terrain.cpp
@@ -52,9 +52,7 @@ int Terrain::lineTerrain(XYZ p1, XYZ p2, XYZ *p)
     static int firstintersecting;
     static XYZ point;
     static int startx, starty;
-    static float slope;
     static int endx, endy;
-    static int numtris = (size - 1) * (size - 1) * 2;
     static float highest, lowest;
 
     firstintersecting = -1;
@@ -203,7 +201,6 @@ void Terrain::UpdateTransparencyother(int whichx, int whichy)
 {
     static XYZ vertex;
     static int i, j, a, b, c, d, patch_size, stepsize;
-    static float distance;
 
     patch_size = size / subdivision;
 
@@ -404,7 +401,7 @@ void Terrain::UpdateVertexArray(int whichx, int whichy)
 
 bool Terrain::load(const char *fileName)
 {
-    static long                                i, j;
+    static long i, j;
     static long x, y;
     static float patch_size;
 
@@ -548,14 +545,14 @@ bool Terrain::load(const char *fileName)
     for(j=0;j<size;j++){
     total=0;
     todivide=0;
-    if(i!=0){                          total+=opacityother[j][i-1]; todivide++;}
-    if(i!=size-1){                             total+=opacityother[j][i+1]; todivide++;}
-    if(j!=0){                          total+=opacityother[j-1][i]; todivide++;}
-    if(j!=size-1){                             total+=opacityother[j+1][i]; todivide++;}
-    if(i!=0&&j!=0){                    total+=opacityother[j-1][i-1]; todivide++;}
-    if(i!=size-1&&j!=0){               total+=opacityother[j-1][i+1]; todivide++;}
-    if(j!=size-1&&i!=size-1){          total+=opacityother[j+1][i+1]; todivide++;}
-    if(j!=size-1&&i!=0){               total+=opacityother[j+1][i-1]; todivide++;}
+    if(i!=0){total+=opacityother[j][i-1]; todivide++;}
+    if(i!=size-1){total+=opacityother[j][i+1]; todivide++;}
+    if(j!=0){total+=opacityother[j-1][i]; todivide++;}
+    if(j!=size-1){total+=opacityother[j+1][i]; todivide++;}
+    if(i!=0&&j!=0){total+=opacityother[j-1][i-1]; todivide++;}
+    if(i!=size-1&&j!=0){total+=opacityother[j-1][i+1]; todivide++;}
+    if(j!=size-1&&i!=size-1){total+=opacityother[j+1][i+1]; todivide++;}
+    if(j!=size-1&&i!=0){total+=opacityother[j+1][i-1]; todivide++;}
     total+=opacityother[j][i]; todivide++;
 
     opacityother[j][i]=total/(float)todivide;
@@ -862,7 +859,6 @@ void Terrain::drawpatchotherother(int whichx, int whichy, float opacity)
 
 float Terrain::getHeight(float pointx, float pointz)
 {
-    static float height1, height2;
     static int tilex, tiley;
     static XYZ startpoint, endpoint, intersect, triangle[3], average;
 
@@ -918,7 +914,6 @@ float Terrain::getHeight(float pointx, float pointz)
 
 float Terrain::getHeightExtrude(float pointx, float pointz, float point2x, float point2z)
 {
-    static float height1, height2;
     static int tilex, tiley;
     static XYZ startpoint, endpoint, intersect, triangle[3], average;
 
@@ -1106,7 +1101,7 @@ void Terrain::draw(int layer)
                 if (opacity == 1 && j != subdivision && i != subdivision)
                     if (distance[i + 1][j + 1] > viewdistsquared * fadestart - viewdistsquared)
                         opacity = 0;
-                glMatrixMode(GL_MODELVIEW);                                                    // Select The Modelview Matrix
+                glMatrixMode(GL_MODELVIEW);
                 glPushMatrix();
                 if (frustum.CubeInFrustum(i * patch_size + patch_size * .5, avgypatch[i][j], j * patch_size + patch_size * .5, heightypatch[i][j] / 2)) {
                     if (environment == desertenvironment && distance[i][j] > viewdistsquared / 4)
@@ -1131,11 +1126,10 @@ void Terrain::draw(int layer)
 void Terrain::drawdecals()
 {
     if (decals) {
-        static int i, j;
+        static int i;
         static float distancemult;
         static int lasttype;
 
-        static float patch_size = size / subdivision * scale;
         static float viewdistsquared;
         static bool blend;
 
@@ -1232,7 +1226,7 @@ void Terrain::drawdecals()
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
 
-            glMatrixMode(GL_MODELVIEW);                                                        // Select The Modelview Matrix
+            glMatrixMode(GL_MODELVIEW);
             glPushMatrix();
             glBegin(GL_TRIANGLES);
             for (int j = 0; j < 3; j++) {