From ff393423f5859fff80d2cd92fb71dda7a0357300 Mon Sep 17 00:00:00 2001
From: Gee <gustav@wildfiregames.com>
Date: Sat, 27 Dec 2003 07:24:41 +0000
Subject: [PATCH] just moved the variable declaration out of the for loops when
 the same was used twice. vc6 doesn't like it since it doesn't scope the
 for-header.

This was SVN commit r145.
---
 source/terrain/Patch.cpp    | 6 ++++--
 source/terrain/Renderer.cpp | 8 +++++---
 source/terrain/Terrain.cpp  | 6 ++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/source/terrain/Patch.cpp b/source/terrain/Patch.cpp
index e8fe809690..54f2f4319f 100755
--- a/source/terrain/Patch.cpp
+++ b/source/terrain/Patch.cpp
@@ -25,11 +25,13 @@ CPatch::~CPatch ()
 //Initialize the patch
 void CPatch::Initialize (STerrainVertex *first_vertex)
 {
+	int j;
+
 	m_pVertices = first_vertex;
 
 	m_Bounds.SetEmpty();
 
-	for (int j=0; j<PATCH_SIZE+1; j++)
+	for (j=0; j<PATCH_SIZE+1; j++)
 	{
 		for (int i=0; i<PATCH_SIZE+1; i++)
 		{
@@ -37,7 +39,7 @@ void CPatch::Initialize (STerrainVertex *first_vertex)
 		}
 	}
 
-	for (int j=0; j<16; j++)
+	for (j=0; j<16; j++)
 	{
 		for (int i=0; i<16; i++)
 		{
diff --git a/source/terrain/Renderer.cpp b/source/terrain/Renderer.cpp
index b2d15e20ea..b3d7f79181 100755
--- a/source/terrain/Renderer.cpp
+++ b/source/terrain/Renderer.cpp
@@ -79,15 +79,17 @@ void CRenderer::BeginFrame()
 // force rendering of any batched objects
 void CRenderer::FlushFrame()
 {	
+	int i;
+
 	// render base terrain
 	if (m_TerrainMode==WIREFRAME) {
 		glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
 	}
 
-	for (int i=0;i<m_TerrainPatches.size();++i) {
+	for (i=0;i<m_TerrainPatches.size();++i) {
 		RenderPatchBase(m_TerrainPatches[i].m_Object);
 	}
-	for (int i=0;i<m_TerrainPatches.size();++i) {
+	for (i=0;i<m_TerrainPatches.size();++i) {
 		RenderPatchTrans(m_TerrainPatches[i].m_Object);
 	}
 
@@ -96,7 +98,7 @@ void CRenderer::FlushFrame()
 	}
 
 	// render models
-	for (int i=0;i<m_Models.size();++i) {
+	for (i=0;i<m_Models.size();++i) {
 		RenderModel(m_Models[i]);
 	}
 
diff --git a/source/terrain/Terrain.cpp b/source/terrain/Terrain.cpp
index 671b892f93..896215aeed 100755
--- a/source/terrain/Terrain.cpp
+++ b/source/terrain/Terrain.cpp
@@ -52,13 +52,15 @@ bool CTerrain::Load(char *filename)
 
 bool CTerrain::InitFromHeightmap(const u8* data)
 {
+	int j;
+
 	delete[] m_pVertices;
 
 	m_pVertices = new STerrainVertex[MAP_SIZE*MAP_SIZE];
 	if (m_pVertices == NULL)
 		return false;
 
-	for (int j=0; j<MAP_SIZE; j++)
+	for (j=0; j<MAP_SIZE; j++)
 	{
 		for (int i=0; i<MAP_SIZE; i++)
 		{
@@ -70,7 +72,7 @@ bool CTerrain::InitFromHeightmap(const u8* data)
 		}
 	}
 
-	for (int j=0; j<NUM_PATCHES_PER_SIDE; j++)
+	for (j=0; j<NUM_PATCHES_PER_SIDE; j++)
 	{
 		for (int i=0; i<NUM_PATCHES_PER_SIDE; i++)
 		{