Mercurial > hg > openttd

diff src/saveload/afterload.cpp @ 12658:b75d8c6681bd draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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
author smatz <smatz@openttd.org>
date Sat, 08 Aug 2009 16:42:55 +0000
parents 0f7fab6a27e9
children d529aa954d83
line wrap: on
line diff
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -32,6 +32,7 @@
 #include "../economy_base.h"
 #include "../animated_tile_func.h"
 #include "../subsidy_base.h"
+#include "../subsidy_func.h"
 
 #include "table/strings.h"
 
@@ -230,6 +231,7 @@
 	SetCachedEngineCounts();
 
 	Station::RecomputeIndustriesNearForAll();
+	RebuildSubsidisedSourceAndDestinationCache();
 
 	/* Towns have a noise controlled number of airports system
 	 * So each airport's noise value must be added to the town->noise_reached value
@@ -1868,17 +1870,15 @@
 		}
 	}
 
-	{
-		/* Delete invalid subsidies possibly present in old versions (but converted to new savegame) */
+	if (CheckSavegameVersion(125)) {
+		/* Convert old subsidies */
 		Subsidy *s;
 		FOR_ALL_SUBSIDIES(s) {
-			if (s->IsAwarded()) {
-				/* Station -> Station */
-				const Station *from = Station::GetIfValid(s->src);
-				const Station *to = Station::GetIfValid(s->dst);
-				s->src_type = s->dst_type = ST_STATION;
-				if (from != NULL && to != NULL && from->owner == to->owner && Company::IsValidID(from->owner)) continue;
-			} else {
+			/* Convert only nonawarded subsidies. The original source and destination town/industry
+			 * anymore for awarded subsidies, so invalidate them. */
+			if (s->remaining < 12) {
+				s->remaining = 12 - s->remaining; // convert "age" to "remaining"
+				s->awarded = INVALID_COMPANY; // not awarded to anyone
 				const CargoSpec *cs = CargoSpec::Get(s->cargo_type);
 				switch (cs->town_effect) {
 					case TE_PASSENGERS:
@@ -1901,6 +1901,7 @@
 						break;
 				}
 			}
+			/* Awarded subsidy or invalid source/destination, invalidate */
 			s->cargo_type = CT_INVALID;
 		}
 	}