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

Fix #7433: don't use AirportSpec substitute if it's not set (#7435)

pull/7452/head
glx22 2019-03-30 22:12:25 +01:00 committed by GitHub
parent df673e9b2c
commit e93630541d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/newgrf_airport.cpp
View File

@ -100,6 +100,7 @@ AirportSpec AirportSpec::specs[NUM_AIRPORTS]; ///< Airport specifications.
assert(type < lengthof(AirportSpec::specs)); assert(type < lengthof(AirportSpec::specs));
const AirportSpec *as = &AirportSpec::specs[type]; const AirportSpec *as = &AirportSpec::specs[type];
if (type >= NEW_AIRPORT_OFFSET && !as->enabled) { if (type >= NEW_AIRPORT_OFFSET && !as->enabled) {
if (_airport_mngr.GetGRFID(type) == 0) return as;
byte subst_id = _airport_mngr.GetSubstituteID(type); byte subst_id = _airport_mngr.GetSubstituteID(type);
if (subst_id == AT_INVALID) return as; if (subst_id == AT_INVALID) return as;
as = &AirportSpec::specs[subst_id]; as = &AirportSpec::specs[subst_id];