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

Normalised tooltip string IDs (#3420) 

* Moving all 'TIP' to the end

Searched for all _TIP_ strings and moved them to the end as it's more efficient to find them that way+ Gymnasiast told me '>We always put TIP at the end'

* Changed the tip strings + fixed the spacings (#23)

* Fixing the comma

* Reverting changes to cheats.c to start over

* Add Re-named strings in Cheats.c + align desc.

This is the second attempt, this time I've just changed the strings to match `src/localisation/string_ids.h`, the only thing aligned is the descriptions with newly added tips that got miss-aligned
This commit is contained in:
Nubbie 2016-04-26 12:28:12 +02:00 committed by Ted John
parent 80dc44836a
commit 54f11e66cb
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/localisation/string_ids.h
View File

@ -1427,9 +1427,9 @@ enum {
STR_SHORTCUT_SCREENSHOT = 2524,
STR_INDIVIDUAL_KEYS_BASE = 2525,
STR_CHEAT_TIP_5K_MONEY = 2681,
STR_CHEAT_5K_MONEY_TIP = 2681,
STR_CHEAT_TIP_LARGE_TRAM_GUESTS = 2684,
STR_CHEAT_LARGE_TRAM_GUESTS_TIP = 2684,
STR_SAVE_EVERY_MINUTE = 2701,
STR_SAVE_EVERY_5MINUTES = 2702,
@ -1997,12 +1997,12 @@ enum {
STR_CHEAT_SANDBOX_MODE_TIP = 5280,
STR_CHEAT_EXPLODE = 5285,
STR_CHEAT_TIP_EXPLODE = 5286,
STR_CHEAT_EXPLODE_TIP = 5286,
STR_DEBUG_NO_BREAKDOWNS_AVAILABLE = 5289,
STR_DEBUG_FIX_RIDE = 5290,
STR_CHEAT_TIP_CLEAR_LOAN = 5301,
STR_CHEAT_CLEAR_LOAN_TIP = 5301,
STR_CHEAT_CLEAR_LOAN = 5302,
STR_CHEAT_BUILD_IN_PAUSE_MODE = 5303,
@ -2059,7 +2059,7 @@ enum {
STR_CHEAT_GUEST_NAUSEA_TOLERANCE = 5357,
STR_CHEAT_GUEST_BATHROOM = 5358,
STR_CHEAT_REMOVE_ALL_GUESTS = 5359,
STR_CHEAT_TIP_REMOVE_ALL_GUESTS = 5360,
STR_CHEAT_REMOVE_ALL_GUESTS_TIP = 5360,
STR_CHEAT_GIVE_ALL_GUESTS = 5361,
STR_CHEAT_GUEST_PREFERRED_INTENSITY = 5362,
STR_CHEAT_MORE_THAN_1 = 5363,
@ -2071,7 +2071,7 @@ enum {
STR_CHEAT_10_MINUTE_INSPECTIONS = 5559,
STR_CHEAT_10_MINUTE_INSPECTIONS_TIP = 5560,
STR_CHEAT_PARK_PARAMETERS = 5369,
STR_CHEAT_TIP_PARK_PARAMETERS = 5370,
STR_CHEAT_PARK_PARAMETERS_TIP = 5370,
STR_DEBUG_DROPDOWN_OBJECT_SELECTION = 5371,
@ -2364,7 +2364,7 @@ enum {
STR_CUSTOMERS_ON_RIDE = 5739,
STR_CHEAT_NEVERENDING_MARKETING = 5740,
STR_CHEAT_TIP_NEVERENDING_MARKETING = 5741,
STR_CHEAT_NEVERENDING_MARKETING_TIP = 5741,
STR_MULTIPLAYER_AUTHENTICATING = 5742,
STR_MULTIPLAYER_CONNECTING = 5743,
@ -2425,17 +2425,17 @@ enum {
STR_DISABLE_LIGHTNING_EFFECT = 5789,
STR_CHEAT_TIP_UNLOCK_PRICES = 5790,
STR_CHEAT_TIP_RENEW_RIDES = 5791,
STR_CHEAT_TIP_FIX_ALL_RIDES = 5792,
STR_CHEAT_TIP_RESET_CRASH_STATUS = 5793,
STR_CHEAT_TIP_MAKE_DESTRUCTABLE = 5794,
STR_CHEAT_TIP_IGNORE_INTENSITY = 5795,
STR_CHEAT_TIP_OPEN_PARK = 5796,
STR_CHEAT_TIP_FREEZE_CLIMATE = 5797,
STR_CHEAT_TIP_BUILD_IN_PAUSE_MODE = 5798,
STR_CHEAT_TIP_DISABLE_BRAKES_FAILURE = 5799,
STR_CHEAT_TIP_DISABLE_BREAKDOWNS = 5800,
STR_CHEAT_UNLOCK_PRICES_TIP = 5790,
STR_CHEAT_RENEW_RIDES_TIP = 5791,
STR_CHEAT_FIX_ALL_RIDES_TIP = 5792,
STR_CHEAT_RESET_CRASH_STATUS_TIP = 5793,
STR_CHEAT_MAKE_DESTRUCTABLE_TIP = 5794,
STR_CHEAT_IGNORE_INTENSITY_TIP = 5795,
STR_CHEAT_OPEN_PARK_TIP = 5796,
STR_CHEAT_FREEZE_CLIMATE_TIP = 5797,
STR_CHEAT_BUILD_IN_PAUSE_MODE_TIP = 5798,
STR_CHEAT_DISABLE_BRAKES_FAILURE_TIP = 5799,
STR_CHEAT_DISABLE_BREAKDOWNS_TIP = 5800,
STR_CHEAT_DISABLE_LITTERING = 5801,
STR_CHEAT_DISABLE_LITTERING_TIP = 5802,

38
src/windows/cheats.c
View File

@ -190,7 +190,7 @@ static rct_widget window_cheats_guests_widgets[] = {
{ WWT_CLOSEBOX, 1, MIN_BTN_LEFT, MIN_BTN_RIGHT, YPL(7), HPL(7), STR_MIN, STR_NONE }, // bathroom min
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(9), HPL(9), STR_CHEAT_MORE_THAN_1, STR_NONE }, // ride intensity > 1
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(9), HPL(9), STR_CHEAT_LESS_THAN_15, STR_NONE }, // ride intensity < 15
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(10), OHPL(10), STR_CHEAT_IGNORE_INTENSITY, STR_CHEAT_TIP_IGNORE_INTENSITY }, // guests ignore intensity
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(10), OHPL(10), STR_CHEAT_IGNORE_INTENSITY, STR_CHEAT_IGNORE_INTENSITY_TIP }, // guests ignore intensity
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(11), OHPL(11), STR_CHEAT_DISABLE_VANDALISM, STR_CHEAT_DISABLE_VANDALISM_TIP }, // disable vandalism
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(12), OHPL(12), STR_CHEAT_DISABLE_LITTERING, STR_CHEAT_DISABLE_LITTERING_TIP }, // disable littering
{ WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(14), HPL(16.5), STR_CHEAT_GIVE_ALL_GUESTS, STR_NONE }, // Guests parameters group frame
@ -198,9 +198,9 @@ static rct_widget window_cheats_guests_widgets[] = {
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(15), HPL(15), STR_SHOP_ITEM_PLURAL_PARK_MAP, STR_NONE }, // give guests park maps
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(16), HPL(16), STR_SHOP_ITEM_PLURAL_BALLOON, STR_NONE }, // give guests balloons
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(16), HPL(16), STR_SHOP_ITEM_PLURAL_UMBRELLA, STR_NONE }, // give guests umbrellas
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(18), HPL(18), STR_CHEAT_LARGE_TRAM_GUESTS, STR_CHEAT_TIP_LARGE_TRAM_GUESTS }, // large tram
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(18), HPL(18), STR_CHEAT_REMOVE_ALL_GUESTS, STR_CHEAT_TIP_REMOVE_ALL_GUESTS }, // remove all guests
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(19), HPL(19), STR_CHEAT_EXPLODE, STR_CHEAT_TIP_EXPLODE }, // explode guests
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(18), HPL(18), STR_CHEAT_LARGE_TRAM_GUESTS, STR_CHEAT_LARGE_TRAM_GUESTS_TIP }, // large tram
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(18), HPL(18), STR_CHEAT_REMOVE_ALL_GUESTS, STR_CHEAT_REMOVE_ALL_GUESTS_TIP }, // remove all guests
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(19), HPL(19), STR_CHEAT_EXPLODE, STR_CHEAT_EXPLODE_TIP }, // explode guests
{ WIDGETS_END },
};
@ -208,19 +208,19 @@ static rct_widget window_cheats_guests_widgets[] = {
static rct_widget window_cheats_misc_widgets[] = {
MAIN_CHEATS_WIDGETS,
{ WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(0), HPL(6.25), STR_CHEAT_GENERAL_GROUP, STR_NONE }, // General group
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(1), HPL(1), STR_CHEAT_OPEN_PARK, STR_CHEAT_TIP_OPEN_PARK }, // open / close park
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(1), HPL(1), STR_CHEAT_PARK_PARAMETERS, STR_CHEAT_TIP_PARK_PARAMETERS}, // Park parameters
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(1), HPL(1), STR_CHEAT_OPEN_PARK, STR_CHEAT_OPEN_PARK_TIP }, // open / close park
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(1), HPL(1), STR_CHEAT_PARK_PARAMETERS, STR_CHEAT_PARK_PARAMETERS_TIP}, // Park parameters
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(2), HPL(2), STR_CHEAT_SANDBOX_MODE, STR_CHEAT_SANDBOX_MODE_TIP}, // Sandbox mode (edit land ownership in-game)
{ WWT_CHECKBOX, 1, XPL(0), OWPL, YPL(3), OHPL(3), STR_CHEAT_UNLOCK_PRICES, STR_CHEAT_TIP_UNLOCK_PRICES }, // Unlock all prices
{ WWT_CHECKBOX, 1, XPL(0), OWPL, YPL(3), OHPL(3), STR_CHEAT_UNLOCK_PRICES, STR_CHEAT_UNLOCK_PRICES_TIP }, // Unlock all prices
{ WWT_CHECKBOX, 1, XPL(0), WPL(0), YPL(4), HPL(4), STR_FORCE_PARK_RATING, STR_NONE}, // Force park rating
{ WWT_SPINNER, 1, XPL(1), WPL(1) - 10, YPL(4) + 2, HPL(4) - 3, STR_NONE, STR_NONE }, // park rating
{ WWT_DROPDOWN_BUTTON, 1, WPL(1) - 10, WPL(1), YPL(4) + 3, YPL(4) + 7, STR_NUMERIC_UP, STR_NONE }, // increase rating
{ WWT_DROPDOWN_BUTTON, 1, WPL(1) - 10, WPL(1), YPL(4) + 8, YPL(4) + 12, STR_NUMERIC_DOWN, STR_NONE }, // decrease rating
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(5), HPL(5), STR_CHEAT_WIN_SCENARIO, STR_NONE}, // Win scenario
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(5), HPL(5), STR_CHEAT_HAVE_FUN, STR_NONE}, // Have fun!
{ WWT_CHECKBOX, 1, XPL(0), WPL(0), YPL(6), HPL(6), STR_CHEAT_NEVERENDING_MARKETING, STR_CHEAT_TIP_NEVERENDING_MARKETING }, // neverending marketing campaigns
{ WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(7.25), HPL(9.5), STR_CHEAT_CLIMATE_GROUP, STR_NONE }, // Climate group
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(8), HPL(8), STR_CHEAT_FREEZE_CLIMATE, STR_CHEAT_TIP_FREEZE_CLIMATE }, // Freeze climate
{ WWT_CHECKBOX, 1, XPL(0), WPL(0), YPL(6), HPL(6), STR_CHEAT_NEVERENDING_MARKETING, STR_CHEAT_NEVERENDING_MARKETING_TIP }, // neverending marketing campaigns
{ WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(7.25), HPL(9.5), STR_CHEAT_CLIMATE_GROUP, STR_NONE }, // Climate group
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(8), HPL(8), STR_CHEAT_FREEZE_CLIMATE, STR_CHEAT_FREEZE_CLIMATE_TIP }, // Freeze climate
{ WWT_DROPDOWN, 1, XPL(1), WPL(1), YPL(9) + 2, YPL(9) + 13, STR_NONE, STR_FORCE_WEATHER_TOOLTIP }, // Force weather
{ WWT_DROPDOWN_BUTTON, 1, WPL(1) - 11, WPL(1) - 1, YPL(9) + 3, YPL(9) + 12, STR_DROPDOWN_GLYPH, STR_FORCE_WEATHER_TOOLTIP }, // Force weather
{ WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(11), HPL(15.5), STR_CHEAT_STAFF_GROUP, STR_NONE }, // Staff group
@ -237,14 +237,14 @@ static rct_widget window_cheats_misc_widgets[] = {
};
static rct_widget window_cheats_rides_widgets[] = {
MAIN_CHEATS_WIDGETS,
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(0), HPL(0), STR_CHEAT_RENEW_RIDES, STR_CHEAT_TIP_RENEW_RIDES }, // Renew rides
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(1), HPL(1), STR_CHEAT_MAKE_DESTRUCTABLE, STR_CHEAT_TIP_MAKE_DESTRUCTABLE }, // All destructable
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(1), HPL(1), STR_CHEAT_FIX_ALL_RIDES, STR_CHEAT_TIP_FIX_ALL_RIDES }, // Fix all rides
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(0), HPL(0), STR_CHEAT_RENEW_RIDES, STR_CHEAT_RENEW_RIDES_TIP }, // Renew rides
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(1), HPL(1), STR_CHEAT_MAKE_DESTRUCTABLE, STR_CHEAT_MAKE_DESTRUCTABLE_TIP }, // All destructable
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(1), HPL(1), STR_CHEAT_FIX_ALL_RIDES, STR_CHEAT_FIX_ALL_RIDES_TIP }, // Fix all rides
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(11), OHPL(11) + 8, STR_CHEAT_UNLOCK_OPERATING_LIMITS, STR_CHEAT_UNLOCK_OPERATING_LIMITS_TIP },// 410 km/h lift hill etc.
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(9), OHPL(9), STR_CHEAT_DISABLE_BRAKES_FAILURE, STR_CHEAT_TIP_DISABLE_BRAKES_FAILURE }, // Disable brakes failure
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(10), OHPL(10), STR_CHEAT_DISABLE_BREAKDOWNS, STR_CHEAT_TIP_DISABLE_BREAKDOWNS }, // Disable all breakdowns
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(8), OHPL(8), STR_CHEAT_BUILD_IN_PAUSE_MODE, STR_CHEAT_TIP_BUILD_IN_PAUSE_MODE }, // Build in pause mode
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(2), HPL(2), STR_CHEAT_RESET_CRASH_STATUS, STR_CHEAT_TIP_RESET_CRASH_STATUS }, // Reset crash status
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(9), OHPL(9), STR_CHEAT_DISABLE_BRAKES_FAILURE, STR_CHEAT_DISABLE_BRAKES_FAILURE_TIP }, // Disable brakes failure
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(10), OHPL(10), STR_CHEAT_DISABLE_BREAKDOWNS, STR_CHEAT_DISABLE_BREAKDOWNS_TIP }, // Disable all breakdowns
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(8), OHPL(8), STR_CHEAT_BUILD_IN_PAUSE_MODE, STR_CHEAT_BUILD_IN_PAUSE_MODE_TIP }, // Build in pause mode
{ WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(2), HPL(2), STR_CHEAT_RESET_CRASH_STATUS, STR_CHEAT_RESET_CRASH_STATUS_TIP }, // Reset crash status
{ WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(2), HPL(2), STR_CHEAT_10_MINUTE_INSPECTIONS, STR_CHEAT_10_MINUTE_INSPECTIONS_TIP }, // 10 minute inspections
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(7), OHPL(7), STR_CHEAT_SHOW_ALL_OPERATING_MODES, STR_NONE }, // Show all operating modes
{ WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(6), OHPL(6), STR_CHEAT_SHOW_VEHICLES_FROM_OTHER_TRACK_TYPES, STR_NONE }, // Show vehicles from other track types
@ -811,8 +811,8 @@ static void window_cheats_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (w->page == WINDOW_CHEATS_PAGE_MONEY){
RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS, money32) = CHEATS_MONEY_INCREMENT;
gfx_draw_string_left(dpi, STR_CHEAT_TIP_5K_MONEY, (void*)RCT2_ADDRESS_COMMON_FORMAT_ARGS, 0, w->x + XPL(0) + TXTO, w->y + YPL(0) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_TIP_CLEAR_LOAN, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(2) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_5K_MONEY_TIP, (void*)RCT2_ADDRESS_COMMON_FORMAT_ARGS, 0, w->x + XPL(0) + TXTO, w->y + YPL(0) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_CLEAR_LOAN_TIP, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(2) + TXTO);
}
else if(w->page == WINDOW_CHEATS_PAGE_MISC){
gfx_draw_string_left(dpi, STR_CHEAT_STAFF_SPEED, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(15) + TXTO);