Mercurial > hg > openttd

comparison src/ai/api/ai_subsidy.cpp @ 12415:6a77d1df56e2 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r16849) -Codechange: replace GetCargo() by CargoSpec::Get()
author smatz <smatz@openttd.org>
date Thu, 16 Jul 2009 19:00:13 +0000
parents 39ea618c207e
children 575fb5207d86
comparison
equal deleted inserted replaced
12414:5443128573f4 12415:6a77d1df56e2
55 55
56 /* static */ bool AISubsidy::SourceIsTown(SubsidyID subsidy_id) 56 /* static */ bool AISubsidy::SourceIsTown(SubsidyID subsidy_id)
57 { 57 {
58 if (!IsValidSubsidy(subsidy_id) || IsAwarded(subsidy_id)) return false; 58 if (!IsValidSubsidy(subsidy_id) || IsAwarded(subsidy_id)) return false;
59 59
60 return GetCargo(GetCargoType(subsidy_id))->town_effect == TE_PASSENGERS || 60 return CargoSpec::Get(GetCargoType(subsidy_id))->town_effect == TE_PASSENGERS ||
61 GetCargo(GetCargoType(subsidy_id))->town_effect == TE_MAIL; 61 CargoSpec::Get(GetCargoType(subsidy_id))->town_effect == TE_MAIL;
62 } 62 }
63 63
64 /* static */ int32 AISubsidy::GetSource(SubsidyID subsidy_id) 64 /* static */ int32 AISubsidy::GetSource(SubsidyID subsidy_id)
65 { 65 {
66 if (!IsValidSubsidy(subsidy_id)) return INVALID_STATION; 66 if (!IsValidSubsidy(subsidy_id)) return INVALID_STATION;
70 70
71 /* static */ bool AISubsidy::DestinationIsTown(SubsidyID subsidy_id) 71 /* static */ bool AISubsidy::DestinationIsTown(SubsidyID subsidy_id)
72 { 72 {
73 if (!IsValidSubsidy(subsidy_id) || IsAwarded(subsidy_id)) return false; 73 if (!IsValidSubsidy(subsidy_id) || IsAwarded(subsidy_id)) return false;
74 74
75 switch (GetCargo(GetCargoType(subsidy_id))->town_effect) { 75 switch (CargoSpec::Get(GetCargoType(subsidy_id))->town_effect) {
76 case TE_PASSENGERS: 76 case TE_PASSENGERS:
77 case TE_MAIL: 77 case TE_MAIL:
78 case TE_GOODS: 78 case TE_GOODS:
79 case TE_FOOD: 79 case TE_FOOD:
80 return true; 80 return true;