From 728971ddbc590da2f692350940b935eaf8d0180a Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 3 Feb 2024 17:48:50 +0000 Subject: [PATCH] Road stops: Remove 0x6B as alias of roadstop_road_info_nearby_tiles --- docs/newgrf-roadstops.html | 4 ++-- src/newgrf_extension.cpp | 2 +- src/newgrf_extension.h | 1 + src/newgrf_optimiser.cpp | 1 + src/newgrf_roadstop.cpp | 2 +- src/table/newgrf_debug_data.h | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/newgrf-roadstops.html b/docs/newgrf-roadstops.html index bcbf7c6871..afdaeb73ae 100644 --- a/docs/newgrf-roadstops.html +++ b/docs/newgrf-roadstops.html @@ -248,7 +248,7 @@ roadstop_road_stop_info_nearby_tiles_v2Road stop info of nearby tiles (v2)Not in spec 69Information about cargo accepted in the past (BaseStation) 6Aroadstop_road_stop_grfid_nearby_tilesGRFID of nearby road stop tiles - 6Broadstop_road_info_nearby_tilesRoad info of nearby plain road tilesNot in spec + roadstop_road_info_nearby_tilesRoad info of nearby plain road tilesNot in spec

Road stop view/rotation (40, or mappable variable: roadstop_view)

@@ -431,7 +431,7 @@

GRFID of nearby road stop tile (6A, or mappable variable: roadstop_road_stop_grfid_nearby_tiles)

This has the same value as station (feature 4) variable 6A.

-

Road info of nearby plain road tiles (6B, or mappable variable: roadstop_road_info_nearby_tiles)

+

Road info of nearby plain road tiles (mappable variable: roadstop_road_info_nearby_tiles)

The returned value is 0xFFFFFFFF if the selected tile isn't a plain road tile.

diff --git a/src/newgrf_extension.cpp b/src/newgrf_extension.cpp index a5aebb8030..194a5c0b6f 100644 --- a/src/newgrf_extension.cpp +++ b/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"), diff --git a/src/newgrf_extension.h b/src/newgrf_extension.h index c9b6c1475d..ba66e6304e 100644 --- a/src/newgrf_extension.h +++ b/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, diff --git a/src/newgrf_optimiser.cpp b/src/newgrf_optimiser.cpp index 7030799542..f789d6fe76 100644 --- a/src/newgrf_optimiser.cpp +++ b/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: diff --git a/src/newgrf_roadstop.cpp b/src/newgrf_roadstop.cpp index 76a9f9becc..e5eb1340c7 100644 --- a/src/newgrf_roadstop.cpp +++ b/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); diff --git a/src/table/newgrf_debug_data.h b/src/table/newgrf_debug_data.h index 825632656f..bc7414d169 100644 --- a/src/table/newgrf_debug_data.h +++ b/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(), };