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

Check Town::cargo_produced and _town_cargoes_accepted in CheckCaches()

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-05-23 00:39:56 +01:00
parent f0ffb52f2f
commit 546b5248e0
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openttd.cpp
View File

@@ -1315,11 +1315,13 @@ void CheckCaches(bool force_check, std::function<void(const char *)> log)
/* Check the town caches. */ /* Check the town caches. */
std::vector<TownCache> old_town_caches; std::vector<TownCache> old_town_caches;
std::vector<CargoTypes> old_town_cargo_accepted_totals; std::vector<CargoTypes> old_town_cargo_accepted_totals;
std::vector<CargoTypes> old_town_cargo_produced;
std::vector<StationList> old_town_stations_nears; std::vector<StationList> old_town_stations_nears;
Town *t; Town *t;
FOR_ALL_TOWNS(t) { FOR_ALL_TOWNS(t) {
old_town_caches.push_back(t->cache); old_town_caches.push_back(t->cache);
old_town_cargo_accepted_totals.push_back(t->cargo_accepted_total); old_town_cargo_accepted_totals.push_back(t->cargo_accepted_total);
old_town_cargo_produced.push_back(t->cargo_produced);
old_town_stations_nears.push_back(t->stations_near); old_town_stations_nears.push_back(t->stations_near);
} }
@@ -1337,6 +1339,8 @@ void CheckCaches(bool force_check, std::function<void(const char *)> log)
old_industry_stations_nears.push_back(ind->stations_near); old_industry_stations_nears.push_back(ind->stations_near);
} }
const CargoTypes old_town_cargoes_accepted = _town_cargoes_accepted;
extern void RebuildTownCaches(); extern void RebuildTownCaches();
RebuildTownCaches(); RebuildTownCaches();
RebuildSubsidisedSourceAndDestinationCache(); RebuildSubsidisedSourceAndDestinationCache();
@@ -1349,13 +1353,19 @@ void CheckCaches(bool force_check, std::function<void(const char *)> log)
CCLOG("town cache mismatch: town %i", (int)t->index); CCLOG("town cache mismatch: town %i", (int)t->index);
} }
if (old_town_cargo_accepted_totals[i] != t->cargo_accepted_total) { if (old_town_cargo_accepted_totals[i] != t->cargo_accepted_total) {
CCLOG("town cargo_accepted_total mismatch: town %i", (int)t->index); CCLOG("town cargo_accepted_total mismatch: town %i, old: " OTTD_PRINTFHEX64 ". new: " OTTD_PRINTFHEX64, (int)t->index, old_town_cargo_accepted_totals[i], t->cargo_accepted_total);
}
if (old_town_cargo_produced[i] != t->cargo_produced) {
CCLOG("town cargo_produced mismatch: town %i, old: " OTTD_PRINTFHEX64 ". new: " OTTD_PRINTFHEX64, (int)t->index, old_town_cargo_produced[i], t->cargo_produced);
} }
if (old_town_stations_nears[i] != t->stations_near) { if (old_town_stations_nears[i] != t->stations_near) {
CCLOG("town stations_near mismatch: town %i", (int)t->index); CCLOG("town stations_near mismatch: town %i", (int)t->index);
} }
i++; i++;
} }
if (old_town_cargoes_accepted != _town_cargoes_accepted) {
CCLOG("_town_cargoes_accepted mismatch: old: " OTTD_PRINTFHEX64 ". new: " OTTD_PRINTFHEX64, old_town_cargoes_accepted, _town_cargoes_accepted);
}
i = 0; i = 0;
FOR_ALL_STATIONS(st) { FOR_ALL_STATIONS(st) {
if (old_station_industries_nears[i] != st->industries_near) { if (old_station_industries_nears[i] != st->industries_near) {