cpp/openttd-patchpack/source Changeset - r24636:d54ea7ad5a2c

Changeset - r24636:d54ea7ad5a2c

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Johannes E. Krause - 5 years ago 2019-01-15 18:52:00
j.k@eclipso.de

Add: [NewGRF] Vehicle variable 4A now also returns, whether the current tile has catenary.

1 file changed with 8 insertions and 2 deletions:

src/newgrf_engine.cpp

0 comments (0 inline, 0 general)

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -609,12 +609,18 @@ static uint32 VehicleGetVariable(Vehicle @@
 			switch (v->type) {
 				case VEH_TRAIN: {
 					RailType rt = GetTileRailType(v->tile);
 					return (HasPowerOnRail(Train::From(v)->railtype, rt) ? 0x100 : 0) | GetReverseRailTypeTranslation(rt, object->ro.grffile);
 					const RailtypeInfo *rti = GetRailTypeInfo(rt);
 					return ((rti->flags & RTFB_CATENARY) ? 0x200 : 0) |
 						(HasPowerOnRail(Train::From(v)->railtype, rt) ? 0x100 : 0) |
 						GetReverseRailTypeTranslation(rt, object->ro.grffile);
+				}
 				case VEH_ROAD: {
 					RoadType rt = GetRoadType(v->tile, GetRoadTramType(RoadVehicle::From(v)->roadtype));
 					return 0x100 | GetReverseRoadTypeTranslation(rt, object->ro.grffile);
 					const RoadTypeInfo *rti = GetRoadTypeInfo(rt);
 					return ((rti->flags & ROTFB_CATENARY) ? 0x200 : 0) |
 x100 |
 						GetReverseRoadTypeTranslation(rt, object->ro.grffile);
+				}
 				default:

0 comments (0 inline, 0 general)