mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #9937: Incorrect tooltips when hovering ride entrances and ride exits 

- Localised strings have an extra POP16, not sure why it was there in vanilla.
- Exit string never appended station number.
This commit is contained in:
Ted John 2019-08-26 14:31:20 +01:00
parent 9be0130f2d
commit 48bc28b618
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/openrct2/ride/Ride.cpp
View File

@ -3442,6 +3442,10 @@ static void ride_entrance_set_map_tooltip(TileElement* tileElement)
argPos, rct_string_id, ride->num_stations <= 1 ? STR_RIDE_ENTRANCE : STR_RIDE_STATION_X_ENTRANCE);
argPos += sizeof(rct_string_id);
argPos += ride->FormatNameTo(gMapTooltipFormatArgs + argPos);
// String IDs have an extra pop16 for some reason
argPos += sizeof(uint16_t);
set_map_tooltip_format_arg(argPos, uint16_t, stationIndex + 1);
argPos += sizeof(uint16_t);
if (queueLength == 0)
@ -3467,9 +3471,16 @@ static void ride_entrance_set_map_tooltip(TileElement* tileElement)
if (ride->stations[i].Start.xy == RCT_XY8_UNDEFINED)
stationIndex--;
set_map_tooltip_format_arg(0, rct_string_id, ride->num_stations <= 1 ? STR_RIDE_EXIT : STR_RIDE_STATION_X_EXIT);
auto nameArgLen = ride->FormatNameTo(gMapTooltipFormatArgs + 2);
set_map_tooltip_format_arg(2 + nameArgLen, uint16_t, stationIndex + 1);
size_t argPos = 0;
set_map_tooltip_format_arg(
argPos, rct_string_id, ride->num_stations <= 1 ? STR_RIDE_EXIT : STR_RIDE_STATION_X_EXIT);
argPos += sizeof(rct_string_id);
argPos += ride->FormatNameTo(gMapTooltipFormatArgs + 2);
// String IDs have an extra pop16 for some reason
argPos += sizeof(uint16_t);
set_map_tooltip_format_arg(argPos, uint16_t, stationIndex + 1);
}
}
}