diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 6f7217545d..6d6e301575 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -2446,7 +2446,7 @@ STR_2438 : STR_2439 : STR_2440 : STR_2441 : -STR_2442 :{BLACK}({STRINGID} remaining) +STR_2442 : STR_2443 :{WINDOW_COLOUR_2}Cost per week: {BLACK}{CURRENCY2DP} STR_2444 :{WINDOW_COLOUR_2}Total cost: {BLACK}{CURRENCY2DP} STR_2445 :Start this marketing campaign @@ -3819,3 +3819,4 @@ STR_5479 :Toolbar STR_5480 :Show toolbar buttons for: STR_5481 :Themes STR_5482 :{WINDOW_COLOUR_2}Time since last inspection: {BLACK}1 minute +STR_5483 :{BLACK}({COMMA16} weeks remaining) diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index b0d85eefc4..d2f7c2fe3b 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -1096,7 +1096,6 @@ enum { STR_ADVERTISING_CAMPAIGN_FOR_2 = 2435, STR_MARKETING_1_WEEK = 2436, - STR_MARKETING_WEEKS_REMAINING = 2442, STR_MARKETING_COST_PER_WEEK = 2443, STR_MARKETING_TOTAL_COST = 2444, STR_MARKETING_START_THIS_MARKETING_CAMPAIGN = 2445, @@ -1831,6 +1830,8 @@ enum { STR_TIME_SINCE_LAST_INSPECTION_MINUTE = 5482, + STR_X_WEEKS_REMAINING = 5483, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 }; diff --git a/src/windows/finances.c b/src/windows/finances.c index 4aaa95ba39..f9fc60455c 100644 --- a/src/windows/finances.c +++ b/src/windows/finances.c @@ -1173,9 +1173,9 @@ static void window_finances_marketing_invalidate(rct_window *w) */ static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dpi) { - int i, x, y; + int i, x, y, weeksRemaining; rct_ride *ride; - rct_string_id shopString, weeksRemainingStringId; + rct_string_id shopString; window_draw_widgets(w, dpi); window_finances_draw_tab_images(dpi, w); @@ -1212,8 +1212,8 @@ static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dp gfx_draw_string_left_clipped(dpi, STR_VOUCHERS_FOR_FREE_ENTRY_TO + i, (void*)0x013CE952, 0, x + 4, y, 296); // Duration - weeksRemainingStringId = (STR_MARKETING_1_WEEK - 1) + (gMarketingCampaignDaysLeft[i] % 128); - gfx_draw_string_left(dpi, STR_MARKETING_WEEKS_REMAINING, &weeksRemainingStringId, 0, x + 304, y); + weeksRemaining = (gMarketingCampaignDaysLeft[i] % 128); + gfx_draw_string_left(dpi, STR_X_WEEKS_REMAINING, &weeksRemaining, 0, x + 304, y); y += 10; }