mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17879) -Codechange: convert awarded pax subsidies from old savegames using simple heuristic (instead of deleting them)

release/1.0
smatz 2009-10-26 18:16:39 +00:00
parent 72a6267284
commit 1165817cf2
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/saveload/afterload.cpp
View File

@ -1860,9 +1860,8 @@ bool AfterLoadGame()
/* Convert old subsidies */ /* Convert old subsidies */
Subsidy *s; Subsidy *s;
FOR_ALL_SUBSIDIES(s) { FOR_ALL_SUBSIDIES(s) {
/* Convert only nonawarded subsidies. The original source and destination town/industry
* can't be determined anymore for awarded subsidies, so invalidate them. */
if (s->remaining < 12) { if (s->remaining < 12) {
/* Converting nonawarded subsidy */
s->remaining = 12 - s->remaining; // convert "age" to "remaining" s->remaining = 12 - s->remaining; // convert "age" to "remaining"
s->awarded = INVALID_COMPANY; // not awarded to anyone s->awarded = INVALID_COMPANY; // not awarded to anyone
const CargoSpec *cs = CargoSpec::Get(s->cargo_type); const CargoSpec *cs = CargoSpec::Get(s->cargo_type);
@ -1886,8 +1885,33 @@ bool AfterLoadGame()
if (Industry::IsValidID(s->src) && Industry::IsValidID(s->dst)) continue; if (Industry::IsValidID(s->src) && Industry::IsValidID(s->dst)) continue;
break; break;
} }
} else {
/* Do our best for awarded subsidies. The original source or destination industry
* can't be determined anymore for awarded subsidies, so invalidate them.
* Town -> Town subsidies are converted using simple heuristic */
s->remaining = 24 - s->remaining; // convert "age of awarded subsidy" to "remaining"
const CargoSpec *cs = CargoSpec::Get(s->cargo_type);
switch (cs->town_effect) {
case TE_PASSENGERS:
case TE_MAIL: {
/* Town -> Town */
const Station *ss = Station::GetIfValid(s->src);
const Station *sd = Station::GetIfValid(s->dst);
if (ss != NULL && sd != NULL && ss->owner == sd->owner &&
Company::IsValidID(ss->owner)) {
s->src_type = s->dst_type = ST_TOWN;
s->src = ss->town->index;
s->dst = sd->town->index;
s->awarded = ss->owner;
continue;
} }
/* Awarded subsidy or invalid source/destination, invalidate */ break;
}
default:
break;
}
}
/* Awarded non-town subsidy or invalid source/destination, invalidate */
delete s; delete s;
} }
} }