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

Fix a few more bugs

This commit is contained in:
Ted John 2019-07-21 12:09:23 +01:00
parent 3f8890afde
commit f8b08b334e
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -886,7 +886,7 @@ static int32_t window_guest_list_is_peep_in_filter(Peep* peep)
if (_window_guest_list_filter_arguments.GetFirstStringId() == STR_NONE && _window_guest_list_selected_filter == 1)
{
set_format_arg_on(_window_guest_list_filter_arguments.args, 0, rct_string_id, STR_NONE);
set_format_arg_on(peepArgs.args, 0, rct_string_id, STR_NONE);
}
if (_window_guest_list_filter_arguments == peepArgs)

11
src/openrct2-ui/windows/NewCampaign.cpp
View File

@ -288,8 +288,17 @@ static void window_new_campaign_mousedown(rct_window* w, rct_widgetindex widgetI
if (ride == nullptr)
break;
// HACK until dropdown items have longer argument buffers
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
ride->FormatNameTo(&gDropdownItemsArgs[i]);
if (ride->custom_name.empty())
{
ride->FormatNameTo(&gDropdownItemsArgs[i]);
}
else
{
gDropdownItemsFormat[i] = STR_OPTIONS_DROPDOWN_ITEM;
set_format_arg_on((uint8_t*)&gDropdownItemsArgs[i], 0, const char*, ride->custom_name.c_str());
}
numItems++;
}

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

@ -3012,7 +3012,8 @@ static void window_ride_vehicle_invalidate(rct_window* w)
ride = get_ride(w->number);
rideEntry = ride->GetRideEntry();
ride->FormatNameTo(gCommonFormatArgs);
w->widgets[WIDX_TITLE].text = STR_ARG_20_STRINGID;
ride->FormatNameTo(gCommonFormatArgs + 20);
// Widget setup
carsPerTrain = ride->num_cars_per_train - rideEntry->zero_cars;
@ -4696,7 +4697,8 @@ static void window_ride_colour_invalidate(rct_window* w)
ride = get_ride(w->number);
rideEntry = ride->GetRideEntry();
ride->FormatNameTo(gCommonFormatArgs);
w->widgets[WIDX_TITLE].text = STR_ARG_16_STRINGID;
ride->FormatNameTo(gCommonFormatArgs + 16);
// Track colours
int32_t colourScheme = w->ride_colour;
@ -6516,7 +6518,9 @@ static void window_ride_income_invalidate(rct_window* w)
window_ride_set_pressed_tab(w);
Ride* ride = get_ride(w->number);
ride->FormatNameTo(gCommonFormatArgs);
w->widgets[WIDX_TITLE].text = STR_ARG_14_STRINGID;
ride->FormatNameTo(gCommonFormatArgs + 14);
rideEntry = ride->GetRideEntry();

1
src/openrct2/peep/Peep.cpp
View File

@ -1846,6 +1846,7 @@ void Peep::FormatActionTo(void* argsV) const
set_format_arg_on(args, 0, rct_string_id, STR_ON_RIDE);
set_format_arg_on(args, 2, rct_string_id, STR_NONE);
}
break;
}
case PEEP_STATE_BUYING:
{