--- a/ai/default/default.c	Sat Feb 18 14:41:24 2006 +0000
+++ b/ai/default/default.c	Sat Feb 18 14:52:42 2006 +0000
@@ -159,9 +159,10 @@
 
 	EngineID i = _cargoc.ai_roadveh_start[cargo];
 	EngineID end = i + _cargoc.ai_roadveh_count[cargo];
-	const Engine* e = GetEngine(i);
-
-	do {
+
+	for (; i != end; i++) {
+		const Engine* e = GetEngine(i);
+
 		if (!HASBIT(e->player_avail, _current_player) || e->reliability < 0x8A3D)
 			continue;
 
@@ -170,7 +171,7 @@
 			best_veh_cost = ret;
 			best_veh_index = i;
 		}
-	} while (++e, ++i != end);
+	}
 
 	return best_veh_index;
 }
@@ -183,9 +184,10 @@
 
 	EngineID i = AIRCRAFT_ENGINES_INDEX;
 	EngineID end = i + NUM_AIRCRAFT_ENGINES;
-	const Engine* e = GetEngine(i);
-
-	do {
+
+	for (; i != end; i++) {
+		const Engine* e = GetEngine(i);
+
 		if (!HASBIT(e->player_avail, _current_player) || e->reliability < 0x8A3D)
 			continue;
 
@@ -200,7 +202,7 @@
 			best_veh_cost = ret;
 			best_veh_index = i;
 		}
-	} while (++e, ++i != end);
+	}
 
 	return best_veh_index;
 }