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

Add: stations_near and industries_near cache check (#8139)

pull/8143/head
glx22 2020-05-12 01:19:52 +02:00 committed by GitHub
parent 48c61c1da1
commit d15c7dbdeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/openttd.cpp
View File

@ -64,6 +64,7 @@
#include "viewport_func.h" #include "viewport_func.h"
#include "viewport_sprite_sorter.h" #include "viewport_sprite_sorter.h"
#include "framerate_type.h" #include "framerate_type.h"
#include "industry.h"
#include "linkgraph/linkgraphschedule.h" #include "linkgraph/linkgraphschedule.h"
@ -1310,6 +1311,13 @@ static void CheckCaches()
assert(memcmp(&v->cargo, buff, sizeof(VehicleCargoList)) == 0); assert(memcmp(&v->cargo, buff, sizeof(VehicleCargoList)) == 0);
} }
/* Backup stations_near */
std::vector<StationList> old_town_stations_near;
for (Town *t : Town::Iterate()) old_town_stations_near.push_back(t->stations_near);
std::vector<StationList> old_industry_stations_near;
for (Industry *ind : Industry::Iterate()) old_industry_stations_near.push_back(ind->stations_near);
for (Station *st : Station::Iterate()) { for (Station *st : Station::Iterate()) {
for (CargoID c = 0; c < NUM_CARGO; c++) { for (CargoID c = 0; c < NUM_CARGO; c++) {
byte buff[sizeof(StationCargoList)]; byte buff[sizeof(StationCargoList)];
@ -1334,6 +1342,29 @@ static void CheckCaches()
DEBUG(desync, 2, "docking tile mismatch: tile %i", (int)tile); DEBUG(desync, 2, "docking tile mismatch: tile %i", (int)tile);
} }
} }
/* Check industries_near */
IndustryList industries_near = st->industries_near;
st->RecomputeCatchment();
if (st->industries_near != industries_near) {
DEBUG(desync, 2, "station industries near mismatch: station %i", st->index);
}
}
/* Check stations_near */
i = 0;
for (Town *t : Town::Iterate()) {
if (t->stations_near != old_town_stations_near[i]) {
DEBUG(desync, 2, "town stations near mismatch: town %i", t->index);
}
i++;
}
i = 0;
for (Industry *ind : Industry::Iterate()) {
if (ind->stations_near != old_industry_stations_near[i]) {
DEBUG(desync, 2, "industry stations near mismatch: industry %i", ind->index);
}
i++;
} }
} }