equal
deleted
inserted
replaced
33 if (!IsValidCargo(cargo_type)) return false; |
33 if (!IsValidCargo(cargo_type)) return false; |
34 const CargoSpec *cargo = ::GetCargo(cargo_type); |
34 const CargoSpec *cargo = ::GetCargo(cargo_type); |
35 return cargo->is_freight; |
35 return cargo->is_freight; |
36 } |
36 } |
37 |
37 |
38 /* static */ int32 AICargo::GetCargoIncome(uint32 distance, uint32 days_in_transit, CargoID cargo_type) |
38 /* static */ int32 AICargo::GetCargoIncome(CargoID cargo_type, uint32 distance, uint32 days_in_transit) |
39 { |
39 { |
40 if (!IsValidCargo(cargo_type)) return 0; |
40 if (!IsValidCargo(cargo_type)) return 0; |
41 return ::GetTransportedGoodsIncome(1, distance, days_in_transit, cargo_type); |
41 return ::GetTransportedGoodsIncome(1, distance, days_in_transit, cargo_type); |
42 } |
42 } |