(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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/cargo_type.h b/src/cargo_type.h
index 30145f266..0222af806 100644
--- a/src/cargo_type.h
+++ b/src/cargo_type.h
@@ -85,15 +85,15 @@ public:
 };
 
 
-/** Types of subsidy source and destination */
+/** Types of cargo source and destination */
 enum SourceType {
-	ST_INDUSTRY, ///< Source/destination is an industry
-	ST_TOWN,     ///< Source/destination is a town
-	ST_STATION,  ///< Source/destination is a station
+	ST_INDUSTRY,     ///< Source/destination is an industry
+	ST_TOWN,         ///< Source/destination is a town
+	ST_HEADQUARTERS, ///< Source/destination are company headquarters
 };
 typedef SimpleTinyEnumT<SourceType, byte> SourceTypeByte;
 
-typedef uint16 SourceID; ///< Contains either industry ID, town ID or station ID (or INVALID_SOURCE)
+typedef uint16 SourceID; ///< Contains either industry ID, town ID or company ID (or INVALID_SOURCE)
 static const SourceID INVALID_SOURCE = 0xFFFF; ///< Invalid/unknown index of source
 
 #endif /* CARGO_TYPE_H */