Merge 0cc6896bdf into c69fc76395

Codefix: Rail type bridge offset is not a SpriteID. (#14471 )
Add: [Badges] Vehicle variable to query badges of current rail or road types.
2025-07-21 20:02:14 +00:00 · 2025-07-21 20:00:04 +00:00 · 2025-05-30 18:09:06 +01:00
2 changed files with 12 additions and 1 deletions
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@ -709,6 +709,17 @@ static uint32_t VehicleGetVariable(Vehicle *v, const VehicleScopeResolver *objec
 			return count;
 		}

+		case 0x65:
+			if (v->type == VEH_TRAIN) {
+				RailType rt = GetRailType(v->tile);
+				return GetBadgeVariableResult(*object->ro.grffile, GetRailTypeInfo(rt)->badges, parameter);
+			}
+			if (v->type == VEH_ROAD) {
+				RoadType rt = GetRoadType(v->tile, GetRoadTramType(RoadVehicle::From(v)->roadtype));
+				return GetBadgeVariableResult(*object->ro.grffile, GetRoadTypeInfo(rt)->badges, parameter);
+			}
+			return UINT_MAX;
+
 		case 0x7A: return GetBadgeVariableResult(*object->ro.grffile, v->GetEngine()->badges, parameter);

 		case 0xFE:
--- a/src/rail.h
+++ b/src/rail.h
@ -184,7 +184,7 @@ public:
 	/**
 	 * Bridge offset
 	 */
-	SpriteID bridge_offset;
+	uint8_t bridge_offset;

 	/**
 	 * Original railtype number to use when drawing non-newgrf railtypes, or when drawing stations.
Author	SHA1	Message	Date
Peter Nelson	3d68ea4c07	Merge `0cc6896bdf` into `c69fc76395`	2025-07-21 20:02:14 +00:00
Peter Nelson	c69fc76395	Codefix: Rail type bridge offset is not a SpriteID. (#14471 )	2025-07-21 20:00:04 +00:00
Peter Nelson	0cc6896bdf	Add: [Badges] Vehicle variable to query badges of current rail or road types.	2025-05-30 18:09:06 +01:00