diff options
author | smatz <smatz@openttd.org> | 2009-08-08 16:42:55 +0000 |
---|---|---|
committer | smatz <smatz@openttd.org> | 2009-08-08 16:42:55 +0000 |
commit | 2a430d981f680485b9d4f9e5fab8bc642952b9bf (patch) | |
tree | e37f617ae610677d7c92aad77b5f184545599102 /src/ai/api/ai_subsidy.cpp | |
parent | eff8cb839072c3aa80d1e54b189810061160669a (diff) | |
download | openttd-2a430d981f680485b9d4f9e5fab8bc642952b9bf.tar.xz |
(svn r17113) -Change [FS#265][FS#2094][FS#2589]: apply the subsidy when subsidy's destination is in station's catchment area and cargo packets originate from subsidy's source
-Change [FS#1134]: subsidies aren't bound to stations after awarding anymore, they still apply to town or industry, no matter what station is used for loading and unloading. Awarded subsidies from older savegames are lost
-Change [NoAI]: due to these changes, AISubsidy::GetSource and AISubsidy::GetDestination now return STATION_INVALID for awarded subsidies
Diffstat (limited to 'src/ai/api/ai_subsidy.cpp')
-rw-r--r-- | src/ai/api/ai_subsidy.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/ai/api/ai_subsidy.cpp b/src/ai/api/ai_subsidy.cpp index fd3e29745..39358e963 100644 --- a/src/ai/api/ai_subsidy.cpp +++ b/src/ai/api/ai_subsidy.cpp @@ -4,6 +4,7 @@ #include "ai_subsidy.hpp" #include "ai_date.hpp" +#include "ai_log.hpp" #include "../../subsidy_base.h" #include "../../station_base.h" #include "../../cargotype.h" @@ -24,7 +25,7 @@ { if (!IsAwarded(subsidy_id)) return AICompany::COMPANY_INVALID; - return (AICompany::CompanyID)((byte)::Station::Get(::Subsidy::Get(subsidy_id)->src)->owner); + return (AICompany::CompanyID)((byte)::Subsidy::Get(subsidy_id)->awarded); } /* static */ int32 AISubsidy::GetExpireDate(SubsidyID subsidy_id) @@ -34,11 +35,7 @@ int year = AIDate::GetYear(AIDate::GetCurrentDate()); int month = AIDate::GetMonth(AIDate::GetCurrentDate()); - if (IsAwarded(subsidy_id)) { - month += 24 - ::Subsidy::Get(subsidy_id)->age; - } else { - month += 12 - ::Subsidy::Get(subsidy_id)->age; - } + month += ::Subsidy::Get(subsidy_id)->remaining; year += (month - 1) / 12; month = ((month - 1) % 12) + 1; @@ -64,6 +61,11 @@ { if (!IsValidSubsidy(subsidy_id)) return INVALID_STATION; + if (IsAwarded(subsidy_id)) { + AILog::Error("AISubsidy::GetSource returned INVALID_STATION due to internal changes in the Subsidy logic."); + return INVALID_STATION; + } + return ::Subsidy::Get(subsidy_id)->src; } @@ -78,5 +80,10 @@ { if (!IsValidSubsidy(subsidy_id)) return INVALID_STATION; + if (IsAwarded(subsidy_id)) { + AILog::Error("AISubsidy::GetDestination returned INVALID_STATION due to internal changes in the Subsidy logic."); + return INVALID_STATION; + } + return ::Subsidy::Get(subsidy_id)->dst; } |