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

(svn r16710) -Fix: invalidate subsidies with invalid source or destination when converting older savegames

Browse Source
This commit is contained in:
smatz
2009-07-01 15:08:43 +00:00
parent 927c4a0fe8
commit 023f78b5ff
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/saveload/afterload.cpp
View File

@@ -31,6 +31,7 @@
#include "../town.h" #include "../town.h"
#include "../economy_base.h" #include "../economy_base.h"
#include "../animated_tile_func.h" #include "../animated_tile_func.h"
#include "../subsidy_type.h"
#include "table/strings.h" #include "table/strings.h"
@@ -1913,6 +1914,36 @@ bool AfterLoadGame()
i++; i++;
} }
} }
/* Delete invalid subsidies possibly present in old versions (but converted to new savegame) */
for (Subsidy *s = _subsidies; s < endof(_subsidies); s++) {
if (s->cargo_type == CT_INVALID) continue;
if (s->age >= 12) {
/* Station -> Station */
const Station *from = Station::GetIfValid(s->from);
const Station *to = Station::GetIfValid(s->to);
if (from != NULL && to != NULL && from->owner == to->owner && Company::IsValidID(from->owner)) continue;
} else {
const CargoSpec *cs = GetCargo(s->cargo_type);
switch (cs->town_effect) {
case TE_PASSENGERS:
case TE_MAIL:
/* Town -> Town */
if (Town::IsValidID(s->from) && Town::IsValidID(s->to)) continue;
break;
case TE_GOODS:
case TE_FOOD:
/* Industry -> Town */
if (Industry::IsValidID(s->from) && Town::IsValidID(s->to)) continue;
break;
default:
/* Industry -> Industry */
if (Industry::IsValidID(s->from) && Industry::IsValidID(s->to)) continue;
break;
}
}
s->cargo_type = CT_INVALID;
}
} }
AfterLoadLabelMaps(); AfterLoadLabelMaps();