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

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-05-07 20:57:13 +01:00
parent 58c02030c2 170f3f9b2b
commit 07c9621fcf
83 changed files with 199 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/openttd.cpp
View File

@@ -1695,6 +1695,23 @@ void CheckCaches(bool force_check, std::function<void(const char *)> log)
st->goods[c].cargo.InvalidateCache();
assert(memcmp(&st->goods[c].cargo, buff, sizeof(StationCargoList)) == 0);
}
/* Check docking tiles */
TileArea ta;
std::map<TileIndex, bool> docking_tiles;
TILE_AREA_LOOP(tile, st->docking_station) {
ta.Add(tile);
docking_tiles[tile] = IsDockingTile(tile);
}
UpdateStationDockingTiles(st);
if (ta.tile != st->docking_station.tile || ta.w != st->docking_station.w || ta.h != st->docking_station.h) {
CCLOG("station docking mismatch: station %i, company %i", st->index, (int)st->owner);
}
TILE_AREA_LOOP(tile, ta) {
if (docking_tiles[tile] != IsDockingTile(tile)) {
CCLOG("docking tile mismatch: tile %i", (int)tile);
}
}
}
for (OrderList *order_list : OrderList::Iterate()) {