1 files changed, 13 insertions, 8 deletions

diff --git a/src/win95/shpchunk.cpp b/src/win95/shpchunk.cpp
index a494767..0514de0 100644
--- a/src/win95/shpchunk.cpp
+++ b/src/win95/shpchunk.cpp
@@ -423,7 +423,9 @@ BOOL Shape_Chunk::assoc_with_object_list(File_Chunk *fc)
 	
 	for (LIF<char *> n(&(hdptr->object_names_store)); !n.done(); n.next())
 	{
-		for (LIF<Chunk *> l(&chlst); !l.done(); l.next())
+		LIF<Chunk *> l(&chlst);
+		
+		for (; !l.done(); l.next())
 		{
 			ob = (Object_Chunk *)l();
 			if ( !strcmp(ob->object_data.o_name, n()) )
@@ -955,6 +957,8 @@ BOOL Shape_Polygon_Chunk::output_chunk (HANDLE &hand)
 
 void Shape_Polygon_Chunk::fill_data_block(char * data_start)
 {
+	int i, j;
+	
 	strncpy (data_start, identifier, 8);
 
 	data_start += 8;
@@ -963,12 +967,12 @@ void Shape_Polygon_Chunk::fill_data_block(char * data_start)
 
 	data_start += 4;
 
-	for (int i=0;i<num_polys;i++) {
+	for (i=0;i<num_polys;i++) {
 		*((int *) (data_start + i*36)) = poly_data[i].engine_type;
 		*((int *) (data_start + i*36 + 4)) = poly_data[i].normal_index;
 		*((int *) (data_start + i*36 + 8)) = poly_data[i].flags;
 		*((int *) (data_start + i*36 + 12)) = poly_data[i].colour;
-		for (int j = 0; j<poly_data[i].num_verts; j++)
+		for (j = 0; j<poly_data[i].num_verts; j++)
 			*((int *) (data_start + i*36 + 16 + j*4)) = poly_data[i].vert_ind[j];
 		for (; j<5; j++)
 			*((int *) (data_start + i*36 + 16 + j*4)) = -1;
@@ -1129,7 +1133,7 @@ uv_data (NULL), num_uvs (*((int *) uvdata))
 	
 }
 
-Shape_UV_Coord_Chunk::output_chunk (HANDLE &hand)
+BOOL Shape_UV_Coord_Chunk::output_chunk (HANDLE &hand)
 {
 	unsigned long junk;
 	BOOL ok;
@@ -1237,7 +1241,7 @@ tex_fns (), num_tex_fns (*((int *) tfndata))
 		
 }
 
-Shape_Texture_Filenames_Chunk::output_chunk (HANDLE &hand)
+BOOL Shape_Texture_Filenames_Chunk::output_chunk (HANDLE &hand)
 {
 	unsigned long junk;
 	BOOL ok;
@@ -1251,8 +1255,7 @@ Shape_Texture_Filenames_Chunk::output_chunk (HANDLE &hand)
 
 	if (!ok) return FALSE;
 
-	return TRUE;
-		
+	return TRUE;		
 }
 
 
@@ -2288,7 +2291,9 @@ void Shape_Morphing_Data_Chunk::prepare_for_output()
 	List<Chunk *> cl;
 	lookup_child("SUBSHAPE",cl);
 	
-	for (LIF<Chunk *> cli(&cl); !cli.done(); cli.next())
+	LIF<Chunk *> cli(&cl);
+	
+	for (; !cli.done(); cli.next())
 	{
 		max_id = max (max_id, ((Shape_Sub_Shape_Chunk *)cli())->get_header()->file_id_num);
 	}