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

use built ago label for ride list instead of age

Browse Source
This commit is contained in:
IntelOrca
2016-02-25 17:58:28 +00:00
parent eb706fbdf5
commit 6484326892
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/language/english_uk.txt
View File

@@ -4038,7 +4038,6 @@ STR_5732 :Anisotropic
STR_5733 :Use NN scaling at integer scales
# tooltip for tab in options window
STR_5734 :{SMALLFONT}{BLACK}Rendering
<<<<<<< HEAD
STR_5735 :Network Status
STR_5736 :Player
STR_5737 :Closed, {COMMA16} person still on ride
@@ -4080,10 +4079,12 @@ STR_5772 :Age
STR_5773 :Total customers: {COMMA32}
STR_5774 :Total profit: {CURRENCY2DP}
STR_5775 :Customers: {COMMA32} per hour
STR_5776 :Age: {COMMA16} year(s)
STR_5777 :Income: {CURRENCY2DP} per hour
STR_5778 :Running cost: {CURRENCY2DP} per hour
STR_5779 :Running cost: Unknown
STR_5776 :Built: This Year
STR_5777 :Built: Last Year
STR_5778 :Built: {COMMA16} Years Ago
STR_5779 :Income: {CURRENCY2DP} per hour
STR_5780 :Running cost: {CURRENCY2DP} per hour
STR_5781 :Running cost: Unknown
#############
# Scenarios #

10
src/localisation/string_ids.h
View File

@@ -2389,10 +2389,12 @@ enum {
STR_RIDE_LIST_TOTAL_CUSTOMERS_LABEL = 5773,
STR_RIDE_LIST_TOTAL_PROFIT_LABEL = 5774,
STR_RIDE_LIST_CUSTOMERS_PER_HOUR_LABEL = 5775,
STR_RIDE_LIST_AGE_LABEL = 5776,
STR_RIDE_LIST_INCOME_LABEL = 5777,
STR_RIDE_LIST_RUNNING_COST_LABEL = 5778,
STR_RIDE_LIST_RUNNING_COST_UNKNOWN = 5779,
STR_RIDE_LIST_BUILT_THIS_YEAR_LABEL = 5776,
STR_RIDE_LIST_BUILT_LAST_YEAR_LABEL = 5777,
STR_RIDE_LIST_BUILT_X_YEARS_AGO_LABEL = 5778,
STR_RIDE_LIST_INCOME_LABEL = 5779,
STR_RIDE_LIST_RUNNING_COST_LABEL = 5780,
STR_RIDE_LIST_RUNNING_COST_UNKNOWN = 5781,
// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
STR_COUNT = 32768

11
src/windows/ride_list.c
View File

@@ -539,9 +539,14 @@ static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
formatSecondary = STR_RIDE_LIST_CUSTOMERS_PER_HOUR_LABEL;
RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 2, uint32) = ride_customers_per_hour(ride);
break;
case INFORMATION_TYPE_AGE:
formatSecondary = STR_RIDE_LIST_AGE_LABEL;
RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 2, sint16) = (sint16)date_get_year(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_YEAR, uint16) - ride->build_date);
case INFORMATION_TYPE_AGE:;
sint16 age = date_get_year(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_YEAR, uint16) - ride->build_date);
switch (age) {
case 0: formatSecondary = STR_RIDE_LIST_BUILT_THIS_YEAR_LABEL; break;
case 1: formatSecondary = STR_RIDE_LIST_BUILT_LAST_YEAR_LABEL; break;
default: formatSecondary = STR_RIDE_LIST_BUILT_X_YEARS_AGO_LABEL; break;
}
RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 2, sint16) = age;
break;
case INFORMATION_TYPE_INCOME:
formatSecondary = 0;