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

Merge pull request #7845 from Gymnasiast/string-removal 

Remove many unused strings
This commit is contained in:
Michael Steenbeek 2018-08-12 16:34:14 +02:00 committed by GitHub
parent 49c30600b7 7af0609de0
commit 78e23e6690
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 55 additions and 1070 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

846
data/language/en-GB.txt
View File

File diff suppressed because it is too large Load Diff

12
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@ -75,7 +75,6 @@ static void window_editor_inventions_list_update(rct_window *w);
static void window_editor_inventions_list_scrollgetheight(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_editor_inventions_list_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_editor_inventions_list_scrollmouseover(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_editor_inventions_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_editor_inventions_list_cursor(rct_window *w, rct_widgetindex widgetIndex, int32_t x, int32_t y, int32_t *cursorId);
static void window_editor_inventions_list_invalidate(rct_window *w);
static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -111,7 +110,7 @@ static rct_window_event_list window_editor_inventions_list_events = {
nullptr,
nullptr,
nullptr,
window_editor_inventions_list_tooltip,
nullptr,
window_editor_inventions_list_cursor,
nullptr,
window_editor_inventions_list_invalidate,
@ -551,15 +550,6 @@ static void window_editor_inventions_list_scrollmouseover(rct_window* w, int32_t
}
}
/**
*
* rct2: 0x0068526B
*/
static void window_editor_inventions_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
/**
*
* rct2: 0x00685291

4
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@ -782,10 +782,6 @@ static void window_editor_object_selection_tooltip(rct_window* w, rct_widgetinde
{
set_format_arg(0, rct_string_id, ObjectSelectionPages[(widgetIndex - WIDX_TAB_1)].Caption);
}
else
{
set_format_arg(0, rct_string_id, STR_LIST);
}
}
/**

12
src/openrct2-ui/windows/Guest.cpp
View File

@ -192,7 +192,6 @@ static void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_guest_rides_resize(rct_window *w);
static void window_guest_rides_update(rct_window *w);
static void window_guest_rides_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_guest_rides_scroll_get_size(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_guest_rides_scroll_mouse_down(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_guest_rides_scroll_mouse_over(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
@ -300,7 +299,7 @@ static rct_window_event_list window_guest_rides_events = {
nullptr,
nullptr,
nullptr,
window_guest_rides_tooltip,
nullptr,
nullptr,
nullptr,
window_guest_rides_invalidate,
@ -1621,15 +1620,6 @@ void window_guest_rides_update(rct_window* w)
}
}
/**
*
* rct2: 0x697844
*/
void window_guest_rides_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
/**
*
* rct2: 0x69784E

12
src/openrct2-ui/windows/GuestList.cpp
View File

@ -97,7 +97,6 @@ static void window_guest_list_update(rct_window *w);
static void window_guest_list_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_guest_list_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_guest_list_scrollmouseover(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_guest_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_guest_list_invalidate(rct_window *w);
static void window_guest_list_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
@ -126,7 +125,7 @@ static rct_window_event_list window_guest_list_events = {
window_guest_list_textinput,
nullptr,
nullptr,
window_guest_list_tooltip,
nullptr,
nullptr,
nullptr,
window_guest_list_invalidate,
@ -604,15 +603,6 @@ static void window_guest_list_scrollmouseover(rct_window* w, int32_t scrollIndex
}
}
/**
*
* rct2: 0x00699E4A
*/
static void window_guest_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
/**
*
* rct2: 0x00699511

8
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -85,7 +85,6 @@ static void window_loadsave_scrollgetsize(rct_window *w, int32_t scrollIndex, in
static void window_loadsave_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_loadsave_scrollmouseover(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_loadsave_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_loadsave_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_loadsave_compute_max_date_width();
static void window_loadsave_invalidate(rct_window *w);
static void window_loadsave_paint(rct_window *w, rct_drawpixelinfo *dpi);
@ -115,7 +114,7 @@ static rct_window_event_list window_loadsave_events =
window_loadsave_textinput,
nullptr,
nullptr,
window_loadsave_tooltip,
nullptr,
nullptr,
nullptr,
window_loadsave_invalidate,
@ -599,11 +598,6 @@ static void window_loadsave_textinput(rct_window* w, rct_widgetindex widgetIndex
}
}
static void window_loadsave_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
static void window_loadsave_compute_max_date_width()
{
// Generate a time object for a relatively wide time: 2000-10-20 00:00:00

12
src/openrct2-ui/windows/Map.cpp
View File

@ -129,7 +129,6 @@ static void window_map_toolabort(rct_window *w, rct_widgetindex widgetIndex);
static void window_map_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_map_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_map_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_map_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_map_invalidate(rct_window *w);
static void window_map_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_map_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
@ -157,7 +156,7 @@ static rct_window_event_list window_map_events = {
window_map_textinput,
nullptr,
nullptr,
window_map_tooltip,
nullptr,
nullptr,
nullptr,
window_map_invalidate,
@ -667,15 +666,6 @@ static void window_map_textinput(rct_window* w, rct_widgetindex widgetIndex, cha
}
}
/**
*
* rct2: 0x0068D140
*/
static void window_map_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_MAP);
}
/**
*
* rct2: 0x0068CA8F

12
src/openrct2-ui/windows/NewRide.cpp
View File

@ -209,7 +209,6 @@ static void window_new_ride_update(rct_window *w);
static void window_new_ride_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_new_ride_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_new_ride_scrollmouseover(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_new_ride_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_new_ride_invalidate(rct_window *w);
static void window_new_ride_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_new_ride_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
@ -239,7 +238,7 @@ static rct_window_event_list window_new_ride_events = {
nullptr,
nullptr,
nullptr,
window_new_ride_tooltip,
nullptr,
nullptr,
nullptr,
window_new_ride_invalidate,
@ -801,15 +800,6 @@ static void window_new_ride_scrollmouseover(rct_window* w, int32_t scrollIndex,
window_invalidate(w);
}
/**
*
* rct2: 0x006B6BBF
*/
static void window_new_ride_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
/**
*
* rct2: 0x006B6819

12
src/openrct2-ui/windows/News.cpp
View File

@ -41,7 +41,6 @@ static void window_news_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_news_update(rct_window *w);
static void window_news_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_news_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_news_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_news_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_news_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
@ -68,7 +67,7 @@ static rct_window_event_list window_news_events = {
nullptr,
nullptr,
nullptr,
window_news_tooltip,
nullptr,
nullptr,
nullptr,
nullptr,
@ -243,15 +242,6 @@ static void window_news_scrollmousedown(rct_window* w, int32_t scrollIndex, int3
}
}
/**
*
* rct2: 0x0066EAAE
*/
static void window_news_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
/**
*
* rct2: 0x0066E4E8

4
src/openrct2-ui/windows/Options.cpp
View File

@ -1124,7 +1124,7 @@ static void window_options_mousedown(rct_window* w, rct_widgetindex widgetIndex,
case WIDX_HEIGHT_LABELS_DROPDOWN:
gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsFormat[1] = STR_DROPDOWN_MENU_LABEL;
gDropdownItemsArgs[0] = STR_UNITS;
gDropdownItemsArgs[0] = STR_HEIGHT_IN_UNITS;
gDropdownItemsArgs[1] = STR_REAL_VALUES;
window_options_show_dropdown(w, widget, 2);
@ -1754,7 +1754,7 @@ static void window_options_invalidate(rct_window* w)
: STR_CELSIUS;
// Height: units/real values
window_options_culture_widgets[WIDX_HEIGHT_LABELS].text = gConfigGeneral.show_height_as_units ? STR_UNITS
window_options_culture_widgets[WIDX_HEIGHT_LABELS].text = gConfigGeneral.show_height_as_units ? STR_HEIGHT_IN_UNITS
: STR_REAL_VALUES;
break;

1
src/openrct2-ui/windows/Ride.cpp
View File

@ -5803,7 +5803,6 @@ static void window_ride_graphs_tooltip(rct_window* w, rct_widgetindex widgetInde
{
if (widgetIndex == WIDX_GRAPH)
{
set_format_arg(0, rct_string_id, STR_GRAPH);
rct_string_id message;
rct_ride_measurement* measurement = ride_get_measurement(w->number, &message);
if (measurement != nullptr && (measurement->flags & RIDE_MEASUREMENT_FLAG_RUNNING))

12
src/openrct2-ui/windows/RideList.cpp
View File

@ -79,7 +79,6 @@ static void window_ride_list_update(rct_window *w);
static void window_ride_list_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_ride_list_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_ride_list_scrollmouseover(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_ride_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_ride_list_invalidate(rct_window *w);
static void window_ride_list_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
@ -107,7 +106,7 @@ static rct_window_event_list window_ride_list_events = {
nullptr,
nullptr,
nullptr,
window_ride_list_tooltip,
nullptr,
nullptr,
nullptr,
window_ride_list_invalidate,
@ -482,15 +481,6 @@ static void window_ride_list_scrollmouseover(rct_window* w, int32_t scrollIndex,
window_invalidate(w);
}
/**
*
* rct2: 0x006B3861
*/
static void window_ride_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
/**
*
* rct2: 0x006B3182

3
src/openrct2-ui/windows/Scenery.cpp
View File

@ -912,9 +912,6 @@ void window_scenery_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_stri
{
switch (widgetIndex)
{
case WIDX_SCENERY_LIST:
set_format_arg(0, uint16_t, STR_LIST);
break;
case WIDX_SCENERY_TAB_1:
case WIDX_SCENERY_TAB_2:
case WIDX_SCENERY_TAB_3:

12
src/openrct2-ui/windows/ShortcutKeys.cpp
View File

@ -44,7 +44,6 @@ static void window_shortcut_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_shortcut_resize(rct_window *w);
static void window_shortcut_invalidate(rct_window *w);
static void window_shortcut_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_shortcut_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_shortcut_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_shortcut_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_shortcut_scrollmouseover(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
@ -73,7 +72,7 @@ static rct_window_event_list window_shortcut_events = {
nullptr,
nullptr,
nullptr,
window_shortcut_tooltip,
nullptr,
nullptr,
nullptr,
window_shortcut_invalidate,
@ -223,15 +222,6 @@ static void window_shortcut_paint(rct_window* w, rct_drawpixelinfo* dpi)
window_draw_widgets(w, dpi);
}
/**
*
* rct2: 0x006E3A0C
*/
static void window_shortcut_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
/**
*
* rct2: 0x006E3A07

12
src/openrct2-ui/windows/StaffList.cpp
View File

@ -49,7 +49,6 @@ static void window_staff_list_toolabort(rct_window *w, rct_widgetindex widgetInd
static void window_staff_list_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height);
static void window_staff_list_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_staff_list_scrollmouseover(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_staff_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_staff_list_invalidate(rct_window *w);
static void window_staff_list_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
@ -77,7 +76,7 @@ static rct_window_event_list window_staff_list_events = {
nullptr,
nullptr,
nullptr,
window_staff_list_tooltip,
nullptr,
nullptr,
nullptr,
window_staff_list_invalidate,
@ -496,15 +495,6 @@ void window_staff_list_scrollmouseover(rct_window* w, int32_t scrollIndex, int32
}
}
/**
*
* rct2: 0x006BDC90
*/
void window_staff_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
/**
*
* rct2: 0x006BD477

8
src/openrct2-ui/windows/Themes.cpp
View File

@ -44,7 +44,6 @@ static void window_themes_scrollgetsize(rct_window *w, int32_t scrollIndex, int3
static void window_themes_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_themes_scrollmouseover(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_themes_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_themes_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_themes_invalidate(rct_window *w);
static void window_themes_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_themes_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
@ -73,7 +72,7 @@ static rct_window_event_list window_themes_events = {
window_themes_textinput,
nullptr,
nullptr,
window_themes_tooltip,
nullptr,
nullptr,
nullptr,
window_themes_invalidate,
@ -743,11 +742,6 @@ static void window_themes_textinput(rct_window* w, rct_widgetindex widgetIndex,
}
}
void window_themes_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
void window_themes_invalidate(rct_window* w)
{
int32_t pressed_widgets = w->pressed_widgets

8
src/openrct2-ui/windows/TitleEditor.cpp
View File

@ -50,7 +50,6 @@ static void window_title_editor_scrollgetsize(rct_window * w, int32_t scrollInde
static void window_title_editor_scrollmousedown(rct_window * w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_title_editor_scrollmouseover(rct_window * w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_title_editor_textinput(rct_window * w, rct_widgetindex widgetIndex, char * text);
static void window_title_editor_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id * stringId);
static void window_title_editor_invalidate(rct_window * w);
static void window_title_editor_paint(rct_window * w, rct_drawpixelinfo * dpi);
static void window_title_editor_scrollpaint(rct_window * w, rct_drawpixelinfo * dpi, int32_t scrollIndex);
@ -86,7 +85,7 @@ static rct_window_event_list window_title_editor_events = {
window_title_editor_textinput,
nullptr,
nullptr,
window_title_editor_tooltip,
nullptr,
nullptr,
nullptr,
window_title_editor_invalidate,
@ -708,11 +707,6 @@ static void window_title_editor_textinput(rct_window* w, rct_widgetindex widgetI
}
}
static void window_title_editor_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
static void window_title_editor_invalidate(rct_window* w)
{
int32_t pressed_widgets = w->pressed_widgets

12
src/openrct2-ui/windows/TrackList.cpp
View File

@ -61,7 +61,6 @@ static void window_track_list_scrollgetsize(rct_window *w, int32_t scrollIndex,
static void window_track_list_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_track_list_scrollmouseover(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y);
static void window_track_list_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void window_track_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id *stringId);
static void window_track_list_invalidate(rct_window *w);
static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex);
@ -89,7 +88,7 @@ static rct_window_event_list window_track_list_events = {
window_track_list_textinput,
nullptr,
nullptr,
window_track_list_tooltip,
nullptr,
nullptr,
nullptr,
window_track_list_invalidate,
@ -421,15 +420,6 @@ static void window_track_list_textinput(rct_window* w, rct_widgetindex widgetInd
window_invalidate(w);
}
/**
*
* rct2: 0x006CFD6C
*/
static void window_track_list_tooltip(rct_window* w, rct_widgetindex widgetIndex, rct_string_id* stringId)
{
set_format_arg(0, rct_string_id, STR_LIST);
}
static void window_track_list_update(rct_window* w)
{
if (gCurrentTextBox.window.classification == w->classification && gCurrentTextBox.window.number == w->number)

121
src/openrct2/localisation/StringIds.h
View File

@ -251,8 +251,7 @@ enum
STR_MONTH_SHORT_OCT = 819,
STR_MONTH_SHORT_NOV = 820, // Unused
STR_MONTH_SHORT_DEC = 821, // Unused
// STR_0822 :Unable to access graphic data file
// STR_0823 :Missing or inaccessible data file
STR_CLOSE_X = 824,
STR_CHOSEN_NAME_IN_USE_ALREADY = 825,
STR_TOO_MANY_NAMES_DEFINED = 826,
@ -264,22 +263,12 @@ enum
STR_ROTATE_TIP = 832,
STR_PAUSE_GAME_TIP = 833,
STR_DISC_AND_GAME_OPTIONS_TIP = 834,
STR_ERR_GAME_INITIALISATION_FAILED = 835,
// STR_0835 :Game initialisation failed
// STR_0836 :Unable to start game in a minimised state
// STR_0837 :Unable to initialise graphics system
// STR_0838 :<removed string - do not use>
STR_RESOLUTION_X_BY_Y = 839,
STR_ARG_16_RESOLUTION_X_BY_Y = 840,
// STR_0841 :<removed string - do not use>
// STR_0842 :<removed string - do not use>
// STR_0843 :<removed string - do not use>
// STR_0844 :<removed string - do not use>
// STR_0845 :<removed string - do not use>
// STR_0846 :<removed string - do not use>
STR_ABOUT = 847,
STR_ROLLERCOASTER_TYCOON_2 = 848,
// STR_VERSION_X = 849,
STR_COPYRIGHT_CS = 850,
STR_DESIGNED_AND_PROGRAMMED_BY_CS = 851,
STR_GRAPHICS_BY_SF = 852,
@ -314,7 +303,7 @@ enum
STR_QUIT_SCENARIO_EDITOR = 887,
STR_QUIT_ROLLERCOASTER_DESIGNER = 888,
STR_QUIT_TRACK_DESIGNS_MANAGER = 889,
// STR_0890 :<removed string - do not use>
STR_SCREENSHOT = 891,
STR_SCREENSHOT_SAVED_AS = 892,
STR_SCREENSHOT_FAILED = 893,
@ -1523,9 +1512,7 @@ enum
STR_SHOP_ITEM_DISPLAY_LEMONADE = 2097,
STR_SHOP_ITEM_DISPLAY_EMPTY_BOX = 2098,
STR_SHOP_ITEM_DISPLAY_EMPTY_BOTTLE = 2099,
STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO2 = 2100, // Unused
STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO3 = 2101, // Unused
STR_SHOP_ITEM_PRICE_LABEL_ON_RIDE_PHOTO4 = 2102, // Unused
STR_SHOP_ITEM_PRICE_LABEL_PRETZEL = 2103,
STR_SHOP_ITEM_PRICE_LABEL_HOT_CHOCOLATE = 2104,
STR_SHOP_ITEM_PRICE_LABEL_ICED_TEA = 2105,
@ -1545,9 +1532,7 @@ enum
STR_SHOP_ITEM_PRICE_LABEL_EMPTY_JUICE_CUP = 2119, // Empty
STR_SHOP_ITEM_PRICE_LABEL_ROAST_SAUSAGE = 2120,
STR_SHOP_ITEM_PRICE_LABEL_EMPTY_BOWL_BLUE = 2121, // Empty
STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO2 = 2122, // Unused
STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO3 = 2123, // Unused
STR_SHOP_ITEM_SINGULAR_ON_RIDE_PHOTO4 = 2124, // Unused
STR_SHOP_ITEM_SINGULAR_PRETZEL = 2125,
STR_SHOP_ITEM_SINGULAR_HOT_CHOCOLATE = 2126,
STR_SHOP_ITEM_SINGULAR_ICED_TEA = 2127,
@ -1567,9 +1552,7 @@ enum
STR_SHOP_ITEM_SINGULAR_EMPTY_JUICE_CUP = 2141,
STR_SHOP_ITEM_SINGULAR_ROAST_SAUSAGE = 2142,
STR_SHOP_ITEM_SINGULAR_EMPTY_BOWL_BLUE = 2143,
STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO2 = 2144, // Unused
STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO3 = 2145, // Unused
STR_SHOP_ITEM_PLURAL_ON_RIDE_PHOTO4 = 2146, // Unused
STR_SHOP_ITEM_PLURAL_PRETZEL = 2147,
STR_SHOP_ITEM_PLURAL_HOT_CHOCOLATE = 2148,
STR_SHOP_ITEM_PLURAL_ICED_TEA = 2149,
@ -1589,9 +1572,7 @@ enum
STR_SHOP_ITEM_PLURAL_EMPTY_JUICE_CUP = 2163,
STR_SHOP_ITEM_PLURAL_ROAST_SAUSAGE = 2164,
STR_SHOP_ITEM_PLURAL_EMPTY_BOWL_BLUE = 2165,
STR_SHOP_ITEM_INDEFINITE_PHOTO2 = 2166, // Unused
STR_SHOP_ITEM_INDEFINITE_PHOTO3 = 2167, // Unused
STR_SHOP_ITEM_INDEFINITE_PHOTO4 = 2168, // Unused
STR_SHOP_ITEM_INDEFINITE_PRETZEL = 2169,
STR_SHOP_ITEM_INDEFINITE_HOT_CHOCOLATE = 2170,
STR_SHOP_ITEM_INDEFINITE_ICED_TEA = 2171,
@ -1611,9 +1592,7 @@ enum
STR_SHOP_ITEM_INDEFINITE_EMPTY_JUICE_CUP = 2185,
STR_SHOP_ITEM_INDEFINITE_ROAST_SAUSAGE = 2186,
STR_SHOP_ITEM_INDEFINITE_EMPTY_BOWL_BLUE = 2187,
STR_SHOP_ITEM_DISPLAY_PHOTO2 = 2188, // Unused
STR_SHOP_ITEM_DISPLAY_PHOTO3 = 2189, // Unused
STR_SHOP_ITEM_DISPLAY_PHOTO4 = 2190, // Unused
STR_SHOP_ITEM_DISPLAY_PRETZEL = 2191,
STR_SHOP_ITEM_DISPLAY_HOT_CHOCOLATE = 2192,
STR_SHOP_ITEM_DISPLAY_ICED_TEA = 2193,
@ -1769,7 +1748,7 @@ enum
STR_EUROS = 2343,
STR_IMPERIAL = 2344,
STR_METRIC = 2345,
STR_DISPLAY = 2346, // Unused
// STR_DISPLAY = 2346, // Unused
STR_NEWS_ITEM_GUEST_DROWNED = 2347,
STR_STAFF_STATS_TIP = 2348,
STR_STAFF_STAT_WAGES = 2349,
@ -1781,8 +1760,7 @@ enum
STR_STAFF_STAT_RIDES_FIXED = 2355,
STR_STAFF_STAT_RIDES_INSPECTED = 2356,
// STR_2357 :House
// STR_2358 :Units
// STR_UNITS = 2358,
STR_HEIGHT_IN_UNITS = 2358,
STR_REAL_VALUES = 2359,
STR_DISPLAY_RESOLUTION = 2360,
STR_TILE_SMOOTHING = 2361,
@ -1879,8 +1857,8 @@ enum
STR_FINANCES_FINANCIAL_GRAPH_CASH_LESS_LOAN_POSITIVE = 2452,
STR_FINANCES_FINANCIAL_GRAPH_CASH_LESS_LOAN_NEGATIVE = 2453,
STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE = 2454,
STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE_POSITIVE = 2455, // Unused
STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE_NEGATIVE = 2456, // Unused
// STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE_POSITIVE = 2455, // Unused
// STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE_NEGATIVE = 2456, // Unused
STR_FINANCES_SHOW_SUMMARY_TAB_TIP = 2457,
STR_FINANCES_SHOW_CASH_TAB_TIP = 2458,
STR_FINANCES_SHOW_PARK_VALUE_TAB_TIP = 2459,
@ -1909,8 +1887,8 @@ enum
STR_PROFIT_PER_WEEK_AND_PARK_VALUE_TIP = 2482,
STR_FINANCES_WEEKLY_PROFIT_POSITIVE = 2483,
STR_FINANCES_WEEKLY_PROFIT_LOSS = 2484,
STR_CONTROLS = 2485, // Unused
STR_GENERAL = 2486, // Unused
// STR_CONTROLS = 2485, // Unused
// STR_GENERAL = 2486, // Unused
STR_REAL_NAME = 2487,
STR_REAL_NAME_TIP = 2488,
STR_HOTKEY = 2489,
@ -2172,7 +2150,7 @@ enum
STR_OPTIONS_MUSIC_ERR_CSS50_NOT_FOUND_HINT = 2743,
// STR_2744 :[
// STR_2745 :\
// STR_2746 :]
// STR_2746 :]
// STR_2747 :{ENDQUOTES}
// STR_2748 :Bar
STR_MY_NEW_SCENARIO = 2749,
@ -2183,10 +2161,10 @@ enum
STR_CHEAT_WATER_PLANTS = 2754,
STR_CHEAT_FIX_VANDALISM = 2755,
STR_CHEAT_REMOVE_LITTER = 2756,
STR_CHEAT_FORCE_SUN = 2757, // <removed string - do not use>
STR_CHEAT_FORCE_THUNDER = 2758, // <removed string - do not use>
STR_CHEAT_ZERO_CLEARANCE = 2759, // <removed string - do not use>
STR_CHEAT_5K_MONEY = 2760,
// STR_CHEAT_FORCE_SUN = 2757, // <removed string - do not use>
// STR_CHEAT_FORCE_THUNDER = 2758, // <removed string - do not use>
// STR_CHEAT_ZERO_CLEARANCE = 2759, // <removed string - do not use>
// STR_CHEAT_5K_MONEY = 2760, // <removed string - do not use>
// STR_2761 :<removed string - do not use>
// STR_2762 :<removed string - do not use>
// STR_2763 :???
@ -2407,7 +2385,7 @@ enum
STR_MUSIC_STYLE_ROCK_STYLE_3 = 3043,
STR_MUSIC_STYLE_CANDY_STYLE = 3044,
STR_SELECT_MUSIC_STYLE_TIP = 3045,
STR_THIS_RIDE_CANNOT_BE_MODIFIED = 3046, // Unused
// STR_THIS_RIDE_CANNOT_BE_MODIFIED = 3046, // Unused
STR_LOCAL_AUTHORITY_FORBIDS_DEMOLITION_OR_MODIFICATIONS_TO_THIS_RIDE = 3047,
STR_MARKETING_CAMPAIGNS_FORBIDDEN_BY_LOCAL_AUTHORITY = 3048,
STR_GOLF_HOLE_A = 3049,
@ -2502,30 +2480,15 @@ enum
STR_CAPACITY = 3142,
STR_SHOW_PEOPLE_ON_MAP_TIP = 3143,
STR_SHOW_RIDES_STALLS_ON_MAP_TIP = 3144,
STR_SCROLL_LEFT_TIP = 3145, // Unused
STR_SCROLL_RIGHT_TIP = STR_SCROLL_LEFT_TIP + 1, // Unused
STR_SCROLL_LEFT_FAST_TIP = STR_SCROLL_LEFT_TIP + 2, // Unused
STR_SCROLL_RIGHT_FAST_TIP = STR_SCROLL_LEFT_TIP + 3, // Unused
STR_SCROLL_LEFT_RIGHT_TIP = STR_SCROLL_LEFT_TIP + 4, // Unused
STR_SCROLL_UP_TIP = STR_SCROLL_LEFT_TIP + 5, // Unused
STR_SCROLL_DOWN_TIP = STR_SCROLL_LEFT_TIP + 6, // Unused
STR_SCROLL_UP_FAST_TIP = STR_SCROLL_LEFT_TIP + 7, // Unused
STR_SCROLL_DOWN_FAST_TIP = STR_SCROLL_LEFT_TIP + 8, // Unused
STR_SCROLL_UP_DOWN_TIP = STR_SCROLL_LEFT_TIP + 9, // Unused
// STR_3155 :
// STR_3156 :
STR_MAP = 3157,
STR_GRAPH = 3158,
STR_LIST = 3159,
STR_SELECT_NUMBER_OF_CIRCUITS_TIP = 3160,
// STR_3161 :<removed string - do not use>
STR_ERR_REASON_NOT_ENOUGH_MEMORY = 3162,
// STR_3163 :Installing new data:
STR_OBJECT_SELECTION_SELECTION_SIZE = 3164,
// STR_PLACEHOLDER = 3165, <placeholder strings are unsafe>
// STR_3166 :{BLACK}(ID:
// STR_3167 :{WINDOW_COLOUR_2}Includes: {BLACK}{COMMA16} objects
STR_OBJECT_SELECTION_DESCRIPTION_SCENARIO_TEXT = 3168,
STR_INCLUDES_X_OBJECTS = 3167,
STR_OBJECT_SELECTION_ERR_OBJECT_DATA_NOT_FOUND = 3169,
STR_OBJECT_SELECTION_ERR_NOT_ENOUGH_SPACE_FOR_GRAPHICS = 3170,
STR_OBJECT_SELECTION_ERR_TOO_MANY_OF_TYPE_SELECTED = 3171,
@ -2678,11 +2641,9 @@ enum
STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN = 3318,
STR_WINDOW_SCENARIO_GROUP = 3319,
STR_UNABLE_TO_SAVE_SCENARIO_FILE = 3320,
// STR_3321 :New objects installed successfully
STR_OBJECTIVE = 3322,
STR_MISSING_OBJECT_DATA_ID = 3323,
STR_REQUIRES_THE_FOLLOWING_ADDON_PACK = 3324,
STR_REQUIRES_AN_ADDON_PACK = 3325,
STR_WINDOW_NO_IMAGE = 3326,
STR_PEEP_SPAWNS_NOT_SET = 3327,
STR_CANT_ADVANCE_TO_NEXT_EDITOR_STAGE = 3328,
@ -2694,7 +2655,7 @@ enum
STR_SAVE_PLUGIN_DATA_TIP = 3334,
STR_ROLLER_COASTER_DESIGNER_SELECT_RIDE_TYPES_VEHICLES = 3335,
STR_TRACK_DESIGNS_MANAGER_SELECT_RIDE_TYPE = 3336,
// STR_3337 :<removed string - do not use>
STR_CUSTOM_DESIGNED_LAYOUT = 3338,
STR_1_DESIGN_AVAILABLE = 3339,
STR_X_DESIGNS_AVAILABLE = 3340,
@ -2719,8 +2680,7 @@ enum
STR_NO_TRACK_DESIGNS_OF_THIS_TYPE = 3359,
STR_WARNING = 3360,
STR_TOO_MANY_TRACK_DESIGNS_OF_THIS_TYPE = 3361,
// STR_3362 :<removed string - do not use>
// STR_3363 :<removed string - do not use>
STR_OBJECT_SELECTION_ADVANCED = 3364,
STR_OBJECT_SELECTION_ADVANCED_TIP = 3365,
STR_MAP_RIDE = 3366,
@ -2738,14 +2698,13 @@ enum
STR_INSTALL_NEW_TRACK_DESIGN_INSTALL = 3378,
STR_INSTALL_NEW_TRACK_DESIGN_CANCEL = 3379,
STR_UNABLE_TO_INSTALL_THIS_TRACK_DESIGN = 3380,
// STR_3381 :File is not compatible or contains invalid data
// STR_3382 :File copy failed
STR_SELECT_NEW_NAME_FOR_TRACK_DESIGN = 3383,
STR_AN_EXISTING_TRACK_DESIGN_ALREADY_HAS_THIS_NAME = 3384,
// STR_3388 :Unable to switch to selected mode
STR_SAVE_TRACK_SCENERY_UNABLE_TO_SELECT_ADDITIONAL_ITEM_OF_SCENERY = 3389,
STR_SAVE_TRACK_SCENERY_TOO_MANY_ITEMS_SELECTED = 3390,
// TUTORIAL
STR_CLEAR_SCENERY_TIP = 3437,
STR_UNABLE_TO_REMOVE_ALL_SCENERY_FROM_HERE = 3438,
STR_CLEAR_SCENERY = 3439,
@ -2763,7 +2722,7 @@ enum
STR_RESEARCH_BUTTON_ON_TOOLBAR = 5121,
STR_CHEAT_RENEW_RIDES = 5123,
// STR_5124 :<not used anymore>
STR_CHEAT_MAKE_DESTRUCTABLE = 5125,
STR_OPTIONS_MUSIC_VALUE_RANDOM = 5126,
STR_DISABLE_ELEVATION = 5127,
@ -3034,7 +2993,7 @@ enum
STR_TITLE_EDITOR_ACTION_RENAME_TIP = 5394,
STR_TITLE_EDITOR_ACTION_LOAD_TIP = 5395,
STR_TITLE_EDITOR_ACTION_RELOAD_TIP = 5396,
// STR_5397 :Can only be used on the title screen
STR_TITLE_EDITOR_ERR_CANT_EDIT_WHILE_PLAYING = 5398,
STR_TITLE_EDITOR_PRESS_STOP_TO_CONTINUE_EDITING = 5399,
STR_ERROR_CANT_CHANGE_TITLE_SEQUENCE = 5400,
@ -3131,7 +3090,7 @@ enum
STR_DEBUG_DROPDOWN_INVENTIONS_LIST = 5491,
STR_DEBUG_DROPDOWN_SCENARIO_OPTIONS = 5492,
STR_SEND_MESSAGE = 5493,
// STR_5494 :<not used anymore>
STR_PLAYER_LIST = 5495, // Unused
STR_PLAYER = 5496,
STR_PING = 5497,
@ -3332,8 +3291,6 @@ enum
STR_FORCE_WEATHER = 5725,
STR_FORCE_WEATHER_TOOLTIP = 5726,
STR_SCALING_QUALITY = 5727,
STR_REQUIRES_HW_DISPLAY = 5728, // unused
STR_REQUIRES_HW_DISPLAY_TIP = 5729, // unused
STR_SCALING_QUALITY_LINEAR = 5731,
STR_OPTIONS_RENDERING_TIP = 5734,
STR_THEMES_WINDOW_NETWORK_STATUS = 5735,
@ -3367,7 +3324,7 @@ enum
STR_ALL_FILES = 5763,
STR_INVALID_RIDE_TYPE = 5764,
STR_CANT_EDIT_INVALID_RIDE_TYPE = 5765,
// 5766 is unused
STR_RIDE_LIST_INCOME = 5767,
STR_RIDE_LIST_TOTAL_CUSTOMERS = 5768,
STR_RIDE_LIST_TOTAL_PROFIT = 5769,

2
src/openrct2/ride/Ride.cpp
View File

@ -3235,7 +3235,7 @@ rct_ride_measurement* ride_get_measurement(int32_t rideIndex, rct_string_id* mes
if (measurement->flags & 1)
{
if (message != nullptr)
*message = 0;
*message = STR_EMPTY;
return measurement;
}
else