mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Fix redundat separator in ride's measurement & test data window tab (#3654)

Browse Source
This commit is contained in:
Martin Černáč
2016-05-18 22:04:57 +02:00
committed by Ted John
parent beb8e41056
commit 2b6770bfad
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/localisation/string_ids.h
View File

@@ -495,7 +495,12 @@ enum {
STR_NO_TEST_RESULTS_YET = 1339,
STR_MAX_SPEED = 1340,
STR_RIDE_TIME = 1341,
STR_RIDE_TIME_ENTRY = 1342,
STR_RIDE_TIME_ENTRY_WITH_SEPARATOR = 1343,
STR_RIDE_LENGTH = 1344,
STR_RIDE_LENGTH_ENTRY = 1345,
STR_RIDE_LENGTH_ENTRY_WITH_SEPARATOR = 1346,
STR_AVERAGE_SPEED = 1347,
STR_MAX_POSITIVE_VERTICAL_G = 1348,
STR_MAX_POSITIVE_VERTICAL_G_RED = 1349,

20
src/windows/ride.c
View File

@@ -4967,17 +4967,21 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
for (i = 0; i < ride->num_stations; i++) {
time = ride->time[numTimes];
if (time != 0) {
set_format_arg(0 + (numTimes * 4), uint16, 1343);
set_format_arg(0 + (numTimes * 4), uint16, STR_RIDE_TIME_ENTRY_WITH_SEPARATOR);
set_format_arg(2 + (numTimes * 4), uint16, time);
numTimes++;
}
}
if (numTimes == 0) {
set_format_arg(0, uint16, 1343);
set_format_arg(0, uint16, STR_RIDE_TIME_ENTRY);
set_format_arg(2, uint16, 0);
numTimes++;
} else {
//sadly, STR_RIDE_TIME_ENTRY_WITH_SEPARATOR are defined with the separator AFTER an entry
//therefore we set the last entry to use the no-separator format now, post-format
set_format_arg(0 + ((numTimes - 1) * 4), uint16, STR_RIDE_TIME_ENTRY);
}
RCT2_GLOBAL(0x013CE94E + (numTimes * 4), uint16) = 1342;
RCT2_GLOBAL(0x013CE94E + (numTimes * 4), uint16) = STR_RIDE_TIME_ENTRY;
set_format_arg(0 + (numTimes * 4), uint16, 0);
set_format_arg(2 + (numTimes * 4), uint16, 0);
set_format_arg(4 + (numTimes * 4), uint16, 0);
@@ -4992,17 +4996,21 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
length = ride->length[numLengths];
if (length != 0) {
length >>= 16;
set_format_arg(0 + (numLengths * 4), uint16, 1346);
set_format_arg(0 + (numLengths * 4), uint16, STR_RIDE_LENGTH_ENTRY_WITH_SEPARATOR);
set_format_arg(2 + (numLengths * 4), uint16, (length & 0xFFFF));
numLengths++;
}
}
if (numLengths == 0) {
set_format_arg(0, uint16, 1346);
set_format_arg(0, uint16, STR_RIDE_LENGTH_ENTRY);
set_format_arg(2, uint16, 0);
numLengths++;
} else {
//sadly, STR_RIDE_LENGTH_ENTRY_WITH_SEPARATOR are defined with the separator AFTER an entry
//therefore we set the last entry to use the no-separator format now, post-format
set_format_arg(0 + ((numTimes - 1) * 4), uint16, STR_RIDE_LENGTH_ENTRY);
}
RCT2_GLOBAL(0x013CE94E + (numLengths * 4), uint16) = 1345;
RCT2_GLOBAL(0x013CE94E + (numLengths * 4), uint16) = STR_RIDE_LENGTH_ENTRY;
set_format_arg(0 + (numLengths * 4), uint16, 0);
set_format_arg(2 + (numLengths * 4), uint16, 0);
set_format_arg(4 + (numLengths * 4), uint16, 0);