--- a/ai/default/default.c	Tue Nov 15 11:08:10 2005 +0000
+++ b/ai/default/default.c	Tue Nov 15 11:46:49 2005 +0000
@@ -1765,8 +1765,7 @@
 	}
 
 	// do the following 8 times
-	i = 8;
-	do {
+	for (i = 0; i < 8; i++) {
 		// check if we can build the default track
 		aib = &p->ai.src;
 		j = p->ai.num_build_rec;
@@ -1808,7 +1807,7 @@
 				assert(r != CMD_ERROR);
 			}
 		} while (++aib,--j);
-	} while (--i);
+	}
 
 	// check if we're done with all of them
 	aib = &p->ai.src;

--- a/disaster_cmd.c	Tue Nov 15 11:08:10 2005 +0000
+++ b/disaster_cmd.c	Tue Nov 15 11:46:49 2005 +0000
@@ -904,9 +904,9 @@
 {
 	int index = GB(Random(), 0, 4);
 	Industry *i;
-	int maxloop = 15;
+	uint m;
 
-	do {
+	for (m = 0; m < 15; m++) {
 		FOR_ALL_INDUSTRIES(i) {
 			if (i->xy != 0 && i->type == IT_COAL_MINE && --index < 0) {
 
@@ -917,17 +917,17 @@
 				{
 					TileIndex tile = i->xy;
 					TileIndexDiff step = TileOffsByDir(GB(Random(), 0, 2));
+					uint n;
 
-					int count = 30;
-					do {
+					for (n = 0; n < 30; i++) {
 						DisasterClearSquare(tile);
 						tile = TILE_MASK(tile + step);
-					} while (--count);
+					}
 				}
 				return;
 			}
 		}
-	} while (--maxloop != 0);
+	}
 }
 
 static DisasterInitProc * const _disaster_initprocs[] = {

--- a/settings_gui.c	Tue Nov 15 11:08:10 2005 +0000
+++ b/settings_gui.c	Tue Nov 15 11:46:49 2005 +0000
@@ -1277,13 +1277,10 @@
 
 	{ // little helper function to calculate _grffile_count
 	  // should be REMOVED once _grffile_count is calculated at loading
-		const GRFFile* c = _first_grffile;
+		const GRFFile* c;
 
 		_grffile_count = 0;
-		while (c != NULL) {
-			_grffile_count++;
-			c = c->next;
-		}
+		for (c = _first_grffile; c != NULL; c = c->next) _grffile_count++;
 	}
 
 	w->vscroll.cap = 12;