diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -938,7 +938,7 @@ static inline void NewVehicleResolver(Re
 	res->GetTriggers   = &VehicleGetTriggers;
 	res->SetTriggers   = &VehicleSetTriggers;
 	res->GetVariable   = &VehicleGetVariable;
-	res->ResolveReal   = &VehicleResolveReal;
+	res->ResolveRealMethod = &VehicleResolveReal;
 
 	res->u.vehicle.self   = v;
 	res->u.vehicle.parent = (v != NULL) ? v->First() : v;
@@ -1330,7 +1330,7 @@ void FillNewGRFVehicleCache(const Vehicl
 		/* Only resolve when the cache isn't valid. */
 		if (HasBit(v->grf_cache.cache_valid, cache_entries[i][1])) continue;
 		bool stub;
-		ro.GetVariable(&ro, cache_entries[i][0], 0, &stub);
+		ro.GetScope(ro.scope)->GetVariable(cache_entries[i][0], 0, &stub);
 	}
 
 	/* Make sure really all bits are set. */