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

Fix: Setting the default railtype to 'first/last available' did not work with NewGRF defined railtypes.

Browse Source
This commit is contained in:
frosch
2019-12-18 00:48:03 +01:00
committed by Charles Pigott
parent 6fa217dfc8
commit b769eb30c4
3 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/rail_gui.cpp
View File

@@ -1927,17 +1927,20 @@ static void SetDefaultRailGui()
/* No rail, just get the first available one */
FALLTHROUGH;
}
case 0:
case 0: {
/* Use first available type */
rt = RAILTYPE_BEGIN;
while (rt < RAILTYPE_END && !HasRailtypeAvail(_local_company, rt)) rt++;
std::vector<RailType>::const_iterator it = std::find_if(_sorted_railtypes.begin(), _sorted_railtypes.end(),
[](RailType r){ return HasRailtypeAvail(_local_company, r); });
rt = it != _sorted_railtypes.end() ? *it : RAILTYPE_BEGIN;
break;
case 1:
}
case 1: {
/* Use last available type */
rt = GetBestRailtype(_local_company);
std::vector<RailType>::const_reverse_iterator it = std::find_if(_sorted_railtypes.rbegin(), _sorted_railtypes.rend(),
[](RailType r){ return HasRailtypeAvail(_local_company, r); });
rt = it != _sorted_railtypes.rend() ? *it : RAILTYPE_BEGIN;
break;
}
default:
NOT_REACHED();
}