Road stops: Remove 0x6B as alias of roadstop_road_info_nearby_tiles

docs/newgrf-roadstops.html

@@ -248,7 +248,7 @@
 		<tr><td></td><td><a href="#roadstop_road_stop_info_nearby_tiles_v2">roadstop_road_stop_info_nearby_tiles_v2</a></td><td>Road stop info of nearby tiles (v2)</td><td>Not in spec</td></tr>
 		<tr><td><a href="https://newgrf-specs.tt-wiki.net/wiki/VariationalAction2/BaseStation">69</a></td><td></td><td>Information about cargo accepted in the past (BaseStation)</td><td></td></tr>
 		<tr><td><a href="#roadstop_road_stop_grfid_nearby_tiles">6A</a></td><td><a href="#roadstop_road_stop_grfid_nearby_tiles">roadstop_road_stop_grfid_nearby_tiles</a></td><td>GRFID of nearby road stop tiles</td><td></td></tr>
-		<tr><td><a href="#roadstop_road_info_nearby_tiles">6B</a></td><td><a href="#roadstop_road_info_nearby_tiles">roadstop_road_info_nearby_tiles</a></td><td>Road info of nearby plain road tiles</td><td>Not in spec</td></tr>
+		<tr><td></td><td><a href="#roadstop_road_info_nearby_tiles">roadstop_road_info_nearby_tiles</a></td><td>Road info of nearby plain road tiles</td><td>Not in spec</td></tr>
 	</table>
 
 	<h4 id="roadstop_view">Road stop view/rotation (40, or mappable variable: roadstop_view)</h4>
@@ -431,7 +431,7 @@
 	<h4 id="roadstop_road_stop_grfid_nearby_tiles">GRFID of nearby road stop tile (6A, or mappable variable: roadstop_road_stop_grfid_nearby_tiles)</h4>
 	<p>This has the same value as <a href="https://newgrf-specs.tt-wiki.net/wiki/VariationalAction2/Stations#GRFID_of_nearby_station_tile_.286A.29">station (feature 4) variable 6A</a>.</p>
 
-	<h4 id="roadstop_road_info_nearby_tiles">Road info of nearby plain road tiles (6B, or mappable variable: roadstop_road_info_nearby_tiles)</h4>
+	<h4 id="roadstop_road_info_nearby_tiles">Road info of nearby plain road tiles (mappable variable: roadstop_road_info_nearby_tiles)</h4>
 
 	The returned value is 0xFFFFFFFF if the selected tile isn't a plain road tile.<br /><br />
 

src/newgrf_extension.cpp

@@ -170,7 +170,7 @@ extern const GRFVariableMapDefinition _grf_action2_remappable_variables[] = {
 	GRFVariableMapDefinition(GSF_ROADSTOPS, 0x67, "roadstop_land_info_nearby_tiles"),
 	GRFVariableMapDefinition(GSF_ROADSTOPS, 0x68, "roadstop_road_stop_info_nearby_tiles"),
 	GRFVariableMapDefinition(GSF_ROADSTOPS, 0x6A, "roadstop_road_stop_grfid_nearby_tiles"),
-	GRFVariableMapDefinition(GSF_ROADSTOPS, 0x6B, "roadstop_road_info_nearby_tiles"),
+	GRFVariableMapDefinition(GSF_ROADSTOPS, A2VRI_ROADSTOP_ROAD_INFO_NEARBY_TILES, "roadstop_road_info_nearby_tiles"),
 	GRFVariableMapDefinition(GSF_ROADSTOPS, A2VRI_ROADSTOP_INFO_NEARBY_TILES_V2, "roadstop_road_stop_info_nearby_tiles_v2"),
 	GRFVariableMapDefinition(GSF_RAILTYPES, A2VRI_RAILTYPE_SIGNAL_RESTRICTION_INFO, "railtype_signal_restriction_info"),
 	GRFVariableMapDefinition(GSF_RAILTYPES, A2VRI_RAILTYPE_SIGNAL_CONTEXT, "railtype_signal_context"),

src/newgrf_extension.h

@@ -82,6 +82,7 @@ enum Action2VariableRemapIds {
 	A2VRI_VEHICLE_CURRENT_SPEED_SCALED,
 	A2VRI_ROADSTOP_INFO_NEARBY_TILES_EXT,
 	A2VRI_ROADSTOP_INFO_NEARBY_TILES_V2,
+	A2VRI_ROADSTOP_ROAD_INFO_NEARBY_TILES,
 	A2VRI_RAILTYPE_SIGNAL_RESTRICTION_INFO,
 	A2VRI_RAILTYPE_SIGNAL_CONTEXT,
 	A2VRI_RAILTYPE_SIGNAL_SIDE,

src/newgrf_optimiser.cpp

@@ -97,6 +97,7 @@ static bool IsExpensiveRoadStopsVariable(uint16_t variable)
 		case 0x6B:
 		case A2VRI_ROADSTOP_INFO_NEARBY_TILES_EXT:
 		case A2VRI_ROADSTOP_INFO_NEARBY_TILES_V2:
+		case A2VRI_ROADSTOP_ROAD_INFO_NEARBY_TILES:
 			return true;
 
 		default:

src/newgrf_roadstop.cpp

@@ -220,7 +220,7 @@ uint32_t RoadStopScopeResolver::GetVariable(uint16_t variable, uint32_t paramete
 		}
 
 		/* Road info of nearby tiles */
-		case 0x6B: {
+		case A2VRI_ROADSTOP_ROAD_INFO_NEARBY_TILES: {
 			if (this->tile == INVALID_TILE) return 0xFFFFFFFF;
 			TileIndex nearby_tile = GetNearbyTile(parameter, this->tile);
 

src/table/newgrf_debug_data.h

@@ -2389,9 +2389,9 @@ static const NIVariable _nif_roadstops[] = {
 	NIV(0x68, "road stop info of nearby tiles"),
 	NIV(0x69, "information about cargo accepted in the past"),
 	NIV(0x6A, "GRFID of nearby road stop tiles"),
-	NIV(0x6B, "Road info of nearby plain road tiles"),
 	NIVF(A2VRI_ROADSTOP_INFO_NEARBY_TILES_EXT, "road stop info of nearby tiles ext", NIVF_SHOW_PARAMS),
 	NIVF(A2VRI_ROADSTOP_INFO_NEARBY_TILES_V2, "road stop info of nearby tiles v2", NIVF_SHOW_PARAMS),
+	NIVF(A2VRI_ROADSTOP_ROAD_INFO_NEARBY_TILES, "Road info of nearby plain road tiles", NIVF_SHOW_PARAMS),
 	NIV_END(),
 };