--- a/src/rail.cpp	Wed Jan 23 08:47:49 2008 +0000
+++ b/src/rail.cpp	Wed Jan 23 09:43:53 2008 +0000
@@ -167,11 +167,12 @@
 {
 	RailTypes rt = RAILTYPES_NONE;
 
-	for (EngineID i = 0; i != TOTAL_NUM_ENGINES; i++) {
+	EngineID i;
+	FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_TRAIN) {
 		const Engine* e = GetEngine(i);
 		const EngineInfo *ei = EngInfo(i);
 
-		if (e->type == VEH_TRAIN && HasBit(ei->climates, _opt.landscape) &&
+		if (HasBit(ei->climates, _opt.landscape) &&
 				(HasBit(e->player_avail, p) || _date >= e->intro_date + 365)) {
 			const RailVehicleInfo *rvi = RailVehInfo(i);
 

--- a/src/road.cpp	Wed Jan 23 08:47:49 2008 +0000
+++ b/src/road.cpp	Wed Jan 23 09:43:53 2008 +0000
@@ -96,11 +96,12 @@
 {
 	RoadTypes rt = ROADTYPES_NONE;
 
-	for (EngineID i = 0; i != TOTAL_NUM_ENGINES; i++) {
+	EngineID i;
+	FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_ROAD) {
 		const Engine* e = GetEngine(i);
 		const EngineInfo *ei = EngInfo(i);
 
-		if (e->type == VEH_ROAD && HasBit(ei->climates, _opt.landscape) &&
+		if (HasBit(ei->climates, _opt.landscape) &&
 				(HasBit(e->player_avail, p) || _date >= e->intro_date + 365)) {
 			SetBit(rt, HasBit(ei->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD);
 		}