(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, 6 insertions, 6 deletions

diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 6d007dfcc..842c35134 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -2840,9 +2840,9 @@ void ModifyStationRatingAround(TileIndex tile, Owner owner, int amount, uint rad
 	}
 }
 
-static void UpdateStationWaiting(Station *st, CargoID type, uint amount)
+static void UpdateStationWaiting(Station *st, CargoID type, uint amount, SourceType source_type, SourceID source_id)
 {
-	st->goods[type].cargo.Append(new CargoPacket(st->index, amount));
+	st->goods[type].cargo.Append(new CargoPacket(st->index, amount, source_type, source_id));
 	SetBit(st->goods[type].acceptance_pickup, GoodsEntry::PICKUP);
 
 	StationAnimationTrigger(st, st->xy, STAT_ANIM_NEW_CARGO, type);
@@ -2926,7 +2926,7 @@ void FindStationsAroundTiles(TileIndex tile, int w_prod, int h_prod, StationList
 	}
 }
 
-uint MoveGoodsToStation(TileIndex tile, int w, int h, CargoID type, uint amount)
+uint MoveGoodsToStation(TileIndex tile, int w, int h, CargoID type, uint amount, SourceType source_type, SourceID source_id)
 {
 	/* Return if nothing to do. Also the rounding below fails for 0. */
 	if (amount == 0) return 0;
@@ -2968,7 +2968,7 @@ uint MoveGoodsToStation(TileIndex tile, int w, int h, CargoID type, uint amount)
 	if (st2 == NULL) {
 		/* only one station around */
 		uint moved = amount * best_rating1 / 256 + 1;
-		UpdateStationWaiting(st1, type, moved);
+		UpdateStationWaiting(st1, type, moved, source_type, source_id);
 		return moved;
 	}
 
@@ -2987,13 +2987,13 @@ uint MoveGoodsToStation(TileIndex tile, int w, int h, CargoID type, uint amount)
 	if (t != 0) {
 		moved = t * best_rating1 / 256 + 1;
 		amount -= t;
-		UpdateStationWaiting(st1, type, moved);
+		UpdateStationWaiting(st1, type, moved, source_type, source_id);
 	}
 
 	if (amount != 0) {
 		amount = amount * best_rating2 / 256 + 1;
 		moved += amount;
-		UpdateStationWaiting(st2, type, amount);
+		UpdateStationWaiting(st2, type, amount, source_type, source_id);
 	}
 
 	return moved;