From 71fa444424be52b9b2c3fd508ad663923d28a62c Mon Sep 17 00:00:00 2001
From: Steven Fuller <relnev@icculus.org>
Date: Sat, 28 Jul 2001 23:13:49 +0000
Subject: Removed headers that were accidently checked in.

Lots of compiling.
---
 src/win95/chunkpal.cpp | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'src/win95/chunkpal.cpp')

diff --git a/src/win95/chunkpal.cpp b/src/win95/chunkpal.cpp
index 0cf1185..8bf84da 100644
--- a/src/win95/chunkpal.cpp
+++ b/src/win95/chunkpal.cpp
@@ -66,7 +66,9 @@ BOOL IsFixedPalette(Chunk_With_Children * parent)
 	{
 		List<Chunk *> plist;
 		parent->lookup_child("PRSETPAL",plist);
-		for (LIF<Chunk *> plit(&plist); !plit.done(); plit.next())
+		
+		LIF<Chunk *> plit(&plist);
+		for (; !plit.done(); plit.next())
 		{
 			for (LIF<Preset_Palette> findconst(&((Preset_Palette_Chunk *)plit())->pplist); !findconst.done(); findconst.next())
 			{
@@ -291,7 +293,9 @@ Environment_TLT_Chunk::Environment_TLT_Chunk (Chunk_With_Children * parent, cons
 : Chunk (parent, "ENVTXLIT"), width (*((int*)(sdata))),
 	num_levels (*((int*)(sdata+4))), flags(*(int *)(sdata+28)), table (0), filename(0)
 {
-	for (int i=0; i<ChunkTLT_NumReserved; ++i) reserved[i] = *(int *)(sdata+8+(i<<2));
+	int i;
+	
+	for (i=0; i<ChunkTLT_NumReserved; ++i) reserved[i] = *(int *)(sdata+8+(i<<2));
 
 	if (flags & ChunkTLTFlag_ExternalFile)
 	{
@@ -340,6 +344,8 @@ size_t Environment_TLT_Chunk::size_chunk()
 
 void Environment_TLT_Chunk::fill_data_block (char * data_start)
 {
+	int i;
+	
 	strncpy (data_start, identifier, 8);
 
 	data_start += 8;
@@ -353,7 +359,7 @@ void Environment_TLT_Chunk::fill_data_block (char * data_start)
 	
 	data_start += 8;
 
-	for (int i=0; i < ChunkTLT_NumReserved ; ++i, data_start+=4)
+	for (i=0; i < ChunkTLT_NumReserved ; ++i, data_start+=4)
 		*((int *)data_start) = reserved[i];
 
 	*(int *)data_start = flags;
@@ -774,7 +780,9 @@ void RIF_Child_Chunk::CreateMD5Chunk(BMP_Flags const & rcbmp, int const * md5id)
 RIF_Child_Chunk::RIF_Child_Chunk (Chunk_With_Children * const parent, const char * sdata, size_t const /*ssize*/)
 : Chunk(parent,"RIFCHILD"), egm_parent((Environment_Game_Mode_Chunk * const)parent)
 {
-	for (int i=0; i<ChunkRIFChild_NumReserved; i++, sdata+=4)
+	int i;
+
+	for (i=0; i<ChunkRIFChild_NumReserved; i++, sdata+=4)
 	{
 		reserved[i] = *((int *) sdata);
 	}
@@ -912,7 +920,9 @@ Coloured_Polygons_Lookup_Chunk::Coloured_Polygons_Lookup_Chunk (Chunk_With_Child
 : Chunk (parent, "CLRLOOKP"), flags (*((int*)(sdata))),
 	filename(0), table (0)
 {
-	for (int i=0; i<ChunkCPLU_NumReserved; ++i) reserved[i] = *(int *)(sdata+4+(i<<2));
+	int i;
+	
+	for (i=0; i<ChunkCPLU_NumReserved; ++i) reserved[i] = *(int *)(sdata+4+(i<<2));
 
 	if (flags & ChunkCPLUFlag_ExternalFile)
 	{
@@ -961,6 +971,8 @@ size_t Coloured_Polygons_Lookup_Chunk::size_chunk()
 
 void Coloured_Polygons_Lookup_Chunk::fill_data_block (char * data_start)
 {
+	int i;
+	
 	strncpy (data_start, identifier, 8);
 
 	data_start += 8;
@@ -973,7 +985,7 @@ void Coloured_Polygons_Lookup_Chunk::fill_data_block (char * data_start)
 	
 	data_start += 4;
 
-	for (int i=0; i < ChunkCPLU_NumReserved ; ++i, data_start+=4)
+	for (i=0; i < ChunkCPLU_NumReserved ; ++i, data_start+=4)
 		*((int *)data_start) = reserved[i];
 
 	if (flags & ChunkCPLUFlag_ExternalFile)
@@ -1003,5 +1015,3 @@ void Coloured_Polygons_Lookup_Chunk::fill_data_block (char * data_start)
 		}
 	}
 }
-
-
-- 
cgit v1.3