From ee7d3d5b06d7dd52e4820585103c57bd5444f36d Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 18 Jul 2023 22:52:37 +0100 Subject: [PATCH] Handle invalid road type in road vehicle variable 4A --- src/newgrf_engine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 435cca006c..3a72de11cd 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -732,6 +732,7 @@ static uint32 VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *object, case VEH_ROAD: { RoadType rt = GetRoadType(v->tile, GetRoadTramType(RoadVehicle::From(v)->roadtype)); + if (rt == INVALID_ROADTYPE) return 0xFF; const RoadTypeInfo *rti = GetRoadTypeInfo(rt); return ((rti->flags & ROTFB_CATENARY) ? 0x200 : 0) | 0x100 |