Ticket #1680: small.patch

source/graphics/GameView.cpp

@@ -515 +515 @@
     const ssize_t patchesPerSide = pTerrain->GetPatchesPerSide();
 
     // find out which patches will be drawn
+    CPatch * patch = NULL;
+    CPatch *nPatch = NULL;
+    float waterHeight;
+    CBoundingBoxAligned bounds;
+    
     for (ssize_t j=0; j<patchesPerSide; j++) {
         for (ssize_t i=0; i<patchesPerSide; i++) {
-            CPatch* patch=pTerrain->GetPatch(i,j);  // can't fail
+            patch=pTerrain->GetPatch(i,j);  // can't fail
 
             // If the patch is underwater, calculate a bounding box that also contains the water plane
-            CBoundingBoxAligned bounds = patch->GetWorldBounds();
-            float waterHeight = g_Renderer.GetWaterManager()->m_WaterHeight + 0.001f;
+            bounds = patch->GetWorldBounds();
+            waterHeight = g_Renderer.GetWaterManager()->m_WaterHeight + 0.001f;
+            
             if(bounds[1].Y < waterHeight) {
                 bounds[1].Y = waterHeight;
             }
@@ -533 +539 @@
                 patch->setDrawState(true);
 
                 // set the renderstate for the neighbors
-                CPatch *nPatch;
 
                 nPatch = pTerrain->GetPatch(i-1,j-1);
                 if(nPatch) nPatch->setDrawState(true);
@@ -567 +572 @@
     {
         for (ssize_t i=0; i<patchesPerSide; i++)
         {
-            CPatch* patch=pTerrain->GetPatch(i,j);  // can't fail
+            patch=pTerrain->GetPatch(i,j);  // can't fail
             if(patch->getDrawState() == true)
             {
                 c->Submit(patch);

source/graphics/Frustum.cpp

@@ -95 +95 @@
 }
 bool CFrustum::IsSphereVisible (const CVector3D &center, float radius) const
 {
+   float Dist;
+   
     for (size_t i=0; i<m_NumPlanes; i++)
     {
-        float Dist = m_aPlanes[i].DistanceToPlane (center);
+        Dist = m_aPlanes[i].DistanceToPlane (center);
         
         //is it behind the plane
         if (Dist < 0)

source/graphics/Camera.cpp

@@ -415 +415 @@
 
     // intermediate planes
     CVector3D intermediatePoints[4];
-    for(int i = 0; i < intermediates; ++i)
-    {
-        float t = (i+1.0)/(intermediates+1.0);
 
-        for(int j = 0; j < 4; ++j)
-            intermediatePoints[j] = nearPoints[j]*t + farPoints[j]*(1.0-t);
+   float t;
+   
+   for(int i = 0; i < intermediates; ++i)
+   {  
+      t = (i+1.0)/(intermediates+1.0);
+      
+       for(int j = 0; j < 4; ++j)
+           intermediatePoints[j] = nearPoints[j]*t + farPoints[j]*(1.0-t);
 
-        glBegin(GL_POLYGON);
-            glVertex3fv(&intermediatePoints[0].X);
-            glVertex3fv(&intermediatePoints[1].X);
-            glVertex3fv(&intermediatePoints[2].X);
-            glVertex3fv(&intermediatePoints[3].X);
-        glEnd();
-    }
+       glBegin(GL_POLYGON);
+           glVertex3fv(&intermediatePoints[0].X);
+           glVertex3fv(&intermediatePoints[1].X);
+           glVertex3fv(&intermediatePoints[2].X);
+           glVertex3fv(&intermediatePoints[3].X);
+       glEnd();
+   }
 #endif
 }