mirror of https://github.com/OpenRCT2/OpenRCT2.git
Remove more remains of scenario description from Object Selection window
This commit is contained in:
parent
cf913d1419
commit
c841ee31e7
|
@ -2414,7 +2414,6 @@ STR_3190 :Path Extras
|
|||
STR_3191 :Scenery Groups
|
||||
STR_3192 :Park Entrance
|
||||
STR_3193 :Water
|
||||
STR_3194 :Scenario Description
|
||||
STR_3195 :Invention List
|
||||
STR_3196 :{WINDOW_COLOUR_2}Research Group: {BLACK}{STRINGID}
|
||||
STR_3197 :{WINDOW_COLOUR_2}Items pre-invented at start of game:
|
||||
|
|
|
@ -99,9 +99,6 @@ static constexpr const ObjectPageDesc ObjectSelectionPages[] = {
|
|||
{ STR_OBJECT_SELECTION_PARK_ENTRANCE, SPR_TAB_PARK, false },
|
||||
{ STR_OBJECT_SELECTION_WATER, SPR_TAB_WATER, false },
|
||||
|
||||
// No longer supported:
|
||||
// { STR_OBJECT_SELECTION_SCENARIO_DESCRIPTION, SPR_TAB_STATS, false },
|
||||
|
||||
// Currently hidden until new save format arrives:
|
||||
// { STR_OBJECT_SELECTION_TERRAIN_SURFACES, SPR_G2_TAB_LAND, false },
|
||||
// { STR_OBJECT_SELECTION_TERRAIN_EDGES, SPR_G2_TAB_LAND, false },
|
||||
|
@ -828,7 +825,7 @@ static void window_editor_object_selection_invalidate(rct_window* w)
|
|||
w->pressed_widgets &= ~(1 << WIDX_ADVANCED);
|
||||
|
||||
// Set window title and buttons
|
||||
set_format_arg(0, rct_string_id, ObjectSelectionPages[get_selected_object_type(w)].Caption);
|
||||
set_format_arg(0, rct_string_id, ObjectSelectionPages[w->selected_tab].Caption);
|
||||
if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)
|
||||
{
|
||||
w->widgets[WIDX_TITLE].text = STR_TRACK_DESIGNS_MANAGER_SELECT_RIDE_TYPE;
|
||||
|
@ -1533,5 +1530,9 @@ static std::string object_get_description(const void* object)
|
|||
|
||||
static int32_t get_selected_object_type(rct_window* w)
|
||||
{
|
||||
return w->selected_tab;
|
||||
auto tab = w->selected_tab;
|
||||
if (tab >= OBJECT_TYPE_SCENARIO_TEXT)
|
||||
return tab + 1;
|
||||
else
|
||||
return tab;
|
||||
}
|
||||
|
|
|
@ -2502,7 +2502,7 @@ enum
|
|||
STR_OBJECT_SELECTION_SCENERY_GROUPS = 3191,
|
||||
STR_OBJECT_SELECTION_PARK_ENTRANCE = 3192,
|
||||
STR_OBJECT_SELECTION_WATER = 3193,
|
||||
STR_OBJECT_SELECTION_SCENARIO_DESCRIPTION = 3194,
|
||||
|
||||
STR_INVENTION_LIST = 3195,
|
||||
STR_INVENTION_RESEARCH_GROUP = 3196,
|
||||
STR_INVENTION_PREINVENTED_ITEMS = 3197,
|
||||
|
|
Loading…
Reference in New Issue