cpp/openttd-patchpack/source Changeset - r27276:f456603f9cab

Changeset - r27276:f456603f9cab

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

kiwitreekor - 13 months ago 2023-05-07 18:04:34
kiwitreekor@gmail.com

Fix: Var68 for station and roadstop was broken (#10784)

2 files changed with 2 insertions and 2 deletions:

src/newgrf_roadstop.cpp

src/newgrf_station.cpp

0 comments (0 inline, 0 general)

src/newgrf_roadstop.cpp

➞

Show inline comments

@@ @@ -157,7 +157,7 @@ uint32 RoadStopScopeResolver::GetVariabl @@
 			if (IsCustomRoadStopSpecIndex(nearby_tile)) {
 				const RoadStopSpecList ssl = BaseStation::GetByTile(nearby_tile)->roadstop_speclist[GetCustomRoadStopSpecIndex(nearby_tile)];
-				res |= 1 << (ssl.grfid != grfid ? 9 : 8) | std::max<uint16_t>(ssl.localidx, 0xFF);
+				res |= 1 << (ssl.grfid != grfid ? 9 : 8) | ClampTo<uint8_t>(ssl.localidx);
+			}
 			return res;
+		}

src/newgrf_station.cpp

➞

Show inline comments

@@ @@ -364,7 +364,7 @@ TownScopeResolver *StationResolverObject @@
 			if (IsCustomStationSpecIndex(nearby_tile)) {
 				const StationSpecList ssl = BaseStation::GetByTile(nearby_tile)->speclist[GetCustomStationSpecIndex(nearby_tile)];
-				res |= 1 << (ssl.grfid != grfid ? 9 : 8) | std::max<uint16_t>(ssl.localidx, 0xFF);
+				res |= 1 << (ssl.grfid != grfid ? 9 : 8) | ClampTo<uint8_t>(ssl.localidx);
+			}
 			return res;
+		}

0 comments (0 inline, 0 general)