dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r7563) -Fix (FS#468): removing towns in the scenario editor could leave subsidies with that town as source/destination, resulting in an assertion when displaying the Subsidies Window.

Browse Source
This commit is contained in:
rubidium
2006-12-26 15:28:11 +00:00
parent c128024b7d
commit 7d05b7c40f
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
economy.c
View File

@@ -848,6 +848,19 @@ Pair SetupSubsidyDecodeParam(const Subsidy* s, bool mode)
return tp;
}
void DeleteSubsidyWithTown(TownID index)
{
Subsidy *s;
for (s = _subsidies; s != endof(_subsidies); s++) {
if (s->cargo_type != CT_INVALID && s->age < 12 &&
(((s->cargo_type == CT_PASSENGERS || s->cargo_type == CT_MAIL) && (index == s->from || index == s->to)) ||
((s->cargo_type == CT_GOODS || s->cargo_type == CT_FOOD) && index == s->to))) {
s->cargo_type = CT_INVALID;
}
}
}
void DeleteSubsidyWithIndustry(IndustryID index)
{
Subsidy *s;
@@ -855,7 +868,7 @@ void DeleteSubsidyWithIndustry(IndustryID index)
for (s = _subsidies; s != endof(_subsidies); s++) {
if (s->cargo_type != CT_INVALID && s->age < 12 &&
s->cargo_type != CT_PASSENGERS && s->cargo_type != CT_MAIL &&
(index == s->from || (s->cargo_type!=CT_GOODS && s->cargo_type!=CT_FOOD && index==s->to))) {
(index == s->from || (s->cargo_type != CT_GOODS && s->cargo_type != CT_FOOD && index == s->to))) {
s->cargo_type = CT_INVALID;
}
}