xrRender_R4: Fix conformance in For loop scope (#104).

OpenXRay · Jan 16, 2016 · 4b9b4a8 · 4b9b4a8
1 parent 1b68a3f
commit 4b9b4a8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Layers/xrRenderPC_R4/r4_loader.cpp b/src/Layers/xrRenderPC_R4/r4_loader.cpp
@@ -321,7 +321,7 @@ void CRender::LoadSectors(IReader* fs)
 	{
 		CDB::Collector	CL;
 		fs->find_chunk	(fsL_PORTALS);
-		for (i=0; i<count; i++)
+		for (u32 i=0; i<count; i++)
 		{
 			b_portal	P;
 			fs->r		(&P,sizeof(P));

diff --git a/src/Layers/xrRenderPC_R4/r4_rendertarget.cpp b/src/Layers/xrRenderPC_R4/r4_rendertarget.cpp
@@ -898,7 +898,7 @@ CRenderTarget::CRenderTarget		()
 			descHBAO.CPUAccessFlags = 0;
 			descHBAO.MiscFlags = 0;
 
-			it = TEX_jitter_count-1;
+			int it = TEX_jitter_count-1;
 			subData[it].pSysMem = tempDataHBAO;
 			subData[it].SysMemPitch = descHBAO.Width*sampleSize * sizeof(float);
 

diff --git a/src/Layers/xrRenderPC_R4/r4_rendertarget_phase_bloom.cpp b/src/Layers/xrRenderPC_R4/r4_rendertarget_phase_bloom.cpp
@@ -40,8 +40,8 @@ void	CalcGauss_k7(
 	// calculate
 	float mag					=	0;
 	for (int i=-7; i<=0; i++)	W[-i]	=	expf	(-float(i*i)/(2*r*r));	// weight
-	for (i=0; i<8; i++)	mag		+= i?2*W[i]:W[i];							// symmetrical weight
-	for (i=0; i<8; i++)	W[i]	= s_out*W[i]/mag;
+	for (int i=0; i<8; i++)	mag		+= i?2*W[i]:W[i];							// symmetrical weight
+	for (int i=0; i<8; i++)	W[i]	= s_out*W[i]/mag;
 
 	// W[0]=0, W[7]=-7
 	w0.set	(W[1],W[2],W[3],W[4]);		// -1, -2, -3, -4