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

Do not allow mixing road/tram types in powered road type list (property 0F)

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-07-18 22:50:27 +01:00
parent 8af0dc223c
commit 7c08376861
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf.cpp
View File

@@ -4761,7 +4761,13 @@ static ChangeInfoResult RoadTypeChangeInfo(uint id, int numinfo, int prop, const
RoadType resolved_rt = GetRoadTypeByLabel(BSWAP32(label), false); RoadType resolved_rt = GetRoadTypeByLabel(BSWAP32(label), false);
if (resolved_rt != INVALID_ROADTYPE) { if (resolved_rt != INVALID_ROADTYPE) {
switch (prop) { switch (prop) {
case 0x0F: SetBit(rti->powered_roadtypes, resolved_rt); break; case 0x0F:
if (GetRoadTramType(resolved_rt) == rtt) {
SetBit(rti->powered_roadtypes, resolved_rt);
} else {
grfmsg(1, "RoadTypeChangeInfo: Powered road type list: Road type %u road/tram type does not match road type %u, ignoring", resolved_rt, rt);
}
break;
case 0x18: SetBit(rti->introduction_required_roadtypes, resolved_rt); break; case 0x18: SetBit(rti->introduction_required_roadtypes, resolved_rt); break;
case 0x19: SetBit(rti->introduces_roadtypes, resolved_rt); break; case 0x19: SetBit(rti->introduces_roadtypes, resolved_rt); break;
} }