mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues 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.

This commit is contained in:
rubidium 2006-12-26 15:28:11 +00:00
parent b58c90a075
commit c140ca6f20
3 changed files with 18 additions and 3 deletions
Show Stats 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;
}
}

5
economy.h
View File

@ -60,8 +60,9 @@ int UpdateCompanyRatingAndValue(Player *p, bool update);
VARDEF Subsidy _subsidies[MAX_PLAYERS];
Pair SetupSubsidyDecodeParam(const Subsidy* s, bool mode);
void DeleteSubsidyWithIndustry(uint16 index);
void DeleteSubsidyWithStation(uint16 index);
void DeleteSubsidyWithTown(TownID index);
void DeleteSubsidyWithIndustry(IndustryID index);
void DeleteSubsidyWithStation(StationID index);
int32 GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type);
uint MoveGoodsToStation(TileIndex tile, int w, int h, int type, uint amount);

1
town_cmd.c
View File

@ -79,6 +79,7 @@ void DestroyTown(Town *t)
}
DeleteName(t->townnametype);
DeleteSubsidyWithTown(t->index);
MarkWholeScreenDirty();
}