Merge pull request #1328 from rd3k/cheat-window-titles

Add cheat window per-tab titles
This commit is contained in:
Ted John 2015-06-13 19:03:42 +01:00
commit 411d5f0752
3 changed files with 14 additions and 7 deletions

View File

@ -3677,4 +3677,8 @@ STR_5340 :Clearance height
STR_5341 :Flags
STR_5342 :Choose a map tile
STR_5343 :Automatically place staff
STR_5344 :Changelog
STR_5344 :Changelog
STR_5345 :Financial cheats
STR_5346 :Guest cheats
STR_5347 :Ride cheats
STR_5348 :Park cheats

View File

@ -990,6 +990,11 @@ enum {
STR_INDIVIDUAL_KEYS_BASE = 2525,
// Cheats
STR_CHEAT_TITLE = 5217,
STR_CHEAT_TITLE_FINANCIAL = 5345,
STR_CHEAT_TITLE_GUEST = 5346,
STR_CHEAT_TITLE_RIDE = 5347,
STR_CHEAT_TITLE_PARK = 5348,
// Money
STR_CHEAT_5K_MONEY = 2760,

View File

@ -110,7 +110,7 @@ enum WINDOW_CHEATS_WIDGET_IDX {
static rct_widget window_cheats_money_widgets[] = {
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0x0FFFFFFFF, 65535}, // panel / background
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, 3165, STR_WINDOW_TITLE_TIP}, // title bar
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_CHEAT_TITLE_FINANCIAL, STR_WINDOW_TITLE_TIP}, // title bar
{ WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, 0x338, STR_CLOSE_WINDOW_TIP}, // close x button
{ WWT_IMGBTN, 1, 0, WW - 1, 43, WH - 1, 0x0FFFFFFFF, 65535}, // tab content panel
{ WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, STR_FINANCIAL_CHEATS_TIP }, // tab 1
@ -125,7 +125,7 @@ static rct_widget window_cheats_money_widgets[] = {
static rct_widget window_cheats_guests_widgets[] = {
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0x0FFFFFFFF, 65535 }, // panel / background
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, 3165, STR_WINDOW_TITLE_TIP }, // title bar
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_CHEAT_TITLE_GUEST, STR_WINDOW_TITLE_TIP }, // title bar
{ WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, 0x338, STR_CLOSE_WINDOW_TIP }, // close x button
{ WWT_IMGBTN, 1, 0, WW - 1, 43, WH - 1, 0x0FFFFFFFF, 65535 }, // tab content panel
{ WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, STR_FINANCIAL_CHEATS_TIP }, // tab 1
@ -142,7 +142,7 @@ static rct_widget window_cheats_guests_widgets[] = {
//Strings for following moved to window_cheats_paint()
static rct_widget window_cheats_misc_widgets[] = {
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0x0FFFFFFFF, 65535 }, // panel / background
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, 3165, STR_WINDOW_TITLE_TIP }, // title bar
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_CHEAT_TITLE_PARK, STR_WINDOW_TITLE_TIP }, // title bar
{ WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, 0x338, STR_CLOSE_WINDOW_TIP }, // close x button
{ WWT_IMGBTN, 1, 0, WW - 1, 43, WH - 1, 0x0FFFFFFFF, 65535 }, // tab content panel
{ WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, STR_FINANCIAL_CHEATS_TIP }, // tab 1
@ -166,7 +166,7 @@ static rct_widget window_cheats_misc_widgets[] = {
};
static rct_widget window_cheats_rides_widgets[] = {
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0x0FFFFFFFF, 65535 }, // panel / background
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, 3165, STR_WINDOW_TITLE_TIP }, // title bar
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_CHEAT_TITLE_RIDE, STR_WINDOW_TITLE_TIP }, // title bar
{ WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, 0x338, STR_CLOSE_WINDOW_TIP }, // close x button
{ WWT_IMGBTN, 1, 0, WW - 1, 43, WH - 1, 0x0FFFFFFFF, 65535 }, // tab content panel
{ WWT_TAB, 1, 3, 33, 17, 43, 0x2000144E, STR_FINANCIAL_CHEATS_TIP }, // tab 1
@ -763,8 +763,6 @@ static void window_cheats_invalidate()
window_get_register(w);
colour_scheme_update(w);
strcpy((char*)0x009BC677, "Cheats");
rct_widget *widgets = window_cheats_page_widgets[w->page];
if (w->widgets != widgets) {
w->widgets = widgets;