diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 4c5a8fe466..6d73744e4b 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -2396,8 +2396,6 @@ STR_3141 :Multi-circuit per ride not possible with cable lift hill STR_3142 :{WINDOW_COLOUR_2}Capacity: {BLACK}{STRINGID} STR_3143 :{SMALLFONT}{BLACK}Show people on map STR_3144 :{SMALLFONT}{BLACK}Show rides and stalls on map -STR_3158 :graph -STR_3159 :list STR_3160 :{SMALLFONT}{BLACK}Select the number of circuits per ride STR_3162 :Unable to allocate enough memory STR_3163 :Installing new data: diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index cd55ad85e2..7f7f91d5c2 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -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 diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index f792105694..544ef5f4d6 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -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); - } } /** diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index db33df753b..b5c54b7474 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -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 diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index bc3081a8d2..f7ce3dae59 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -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 diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index d7ca4a22c6..8e40991656 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -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 diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 9a04b69850..3ca7400437 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -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 diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index d5c4c18075..07d6abebfb 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -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 diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index c90aebf930..062558dafd 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -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)) diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index a35b9fc0ea..5188c06183 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -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 diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 6161d678d1..113f281abd 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -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: diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index 38d2d4bf8c..a807d50bdd 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -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 diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 0eb48e1a41..7e81bdc4bf 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -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 diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index b589d87154..85f41a37ea 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -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 diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index 50e690a6d4..9e173a592b 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -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 diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index 3775c43f64..b129639390 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -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) diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index ee4ae7e172..3d9aecd21b 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -2481,7 +2481,6 @@ enum STR_SHOW_PEOPLE_ON_MAP_TIP = 3143, STR_SHOW_RIDES_STALLS_ON_MAP_TIP = 3144, - STR_GRAPH = 3158, STR_LIST = 3159, STR_SELECT_NUMBER_OF_CIRCUITS_TIP = 3160, diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 41891beaf2..cbdbe5185f 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -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