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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	Makefile.bundle.in
#	src/os/macosx/string_osx.cpp
#	src/station_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2019-11-06 17:49:00 +00:00
parent 91ca46c774 d5a9bd404a
commit ca3c72438e
68 changed files with 1594 additions and 1460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/station_cmd.cpp
View File

@@ -2804,10 +2804,8 @@ void RemoveDockingTile(TileIndex t)
if (IsTileType(tile, MP_STATION)) {
UpdateStationDockingTiles(Station::GetByTile(tile));
} else if (IsTileType(tile, MP_INDUSTRY)) {
Station *st = Industry::GetByTile(tile)->neutral_station;
if (st != nullptr) {
UpdateStationDockingTiles(Industry::GetByTile(tile)->neutral_station);
}
Station *neutral = Industry::GetByTile(tile)->neutral_station;
if (neutral != nullptr) UpdateStationDockingTiles(neutral);
}
}
}