--- a/src/ai/trolly/build.cpp	Tue Apr 29 18:19:29 2008 +0000
+++ b/src/ai/trolly/build.cpp	Tue Apr 29 21:31:29 2008 +0000
@@ -7,6 +7,7 @@
 #include "../../command_func.h"
 #include "trolly.h"
 #include "../../engine_func.h"
+#include "../../engine_base.h"
 #include "../../variables.h"
 #include "../../bridge.h"
 #include "../../vehicle_func.h"
@@ -235,12 +236,12 @@
 	} else {
 		EngineID best_veh_index = INVALID_ENGINE;
 		int32 best_veh_rating = 0;
-		EngineID i;
+		const Engine *e;
 
 		/* Loop through all road vehicles */
-		FOR_ALL_ENGINEIDS_OF_TYPE(i, VEH_ROAD) {
-			const RoadVehicleInfo *rvi = RoadVehInfo(i);
-			const Engine* e = GetEngine(i);
+		FOR_ALL_ENGINES_OF_TYPE(e, VEH_ROAD) {
+			EngineID i = e->index;
+			const RoadVehicleInfo *rvi = &e->u.road;
 
 			/* Skip vehicles which can't take our cargo type */
 			if (rvi->cargo_type != _players_ainew[p->index].cargo && !CanRefitTo(i, _players_ainew[p->index].cargo)) continue;