mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix a few more bugs
This commit is contained in:
parent
3f8890afde
commit
f8b08b334e
|
@ -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)
|
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)
|
if (_window_guest_list_filter_arguments == peepArgs)
|
||||||
|
|
|
@ -288,8 +288,17 @@ static void window_new_campaign_mousedown(rct_window* w, rct_widgetindex widgetI
|
||||||
if (ride == nullptr)
|
if (ride == nullptr)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
// HACK until dropdown items have longer argument buffers
|
||||||
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
|
gDropdownItemsFormat[i] = STR_DROPDOWN_MENU_LABEL;
|
||||||
|
if (ride->custom_name.empty())
|
||||||
|
{
|
||||||
ride->FormatNameTo(&gDropdownItemsArgs[i]);
|
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++;
|
numItems++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3012,7 +3012,8 @@ static void window_ride_vehicle_invalidate(rct_window* w)
|
||||||
ride = get_ride(w->number);
|
ride = get_ride(w->number);
|
||||||
rideEntry = ride->GetRideEntry();
|
rideEntry = ride->GetRideEntry();
|
||||||
|
|
||||||
ride->FormatNameTo(gCommonFormatArgs);
|
w->widgets[WIDX_TITLE].text = STR_ARG_20_STRINGID;
|
||||||
|
ride->FormatNameTo(gCommonFormatArgs + 20);
|
||||||
|
|
||||||
// Widget setup
|
// Widget setup
|
||||||
carsPerTrain = ride->num_cars_per_train - rideEntry->zero_cars;
|
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);
|
ride = get_ride(w->number);
|
||||||
rideEntry = ride->GetRideEntry();
|
rideEntry = ride->GetRideEntry();
|
||||||
|
|
||||||
ride->FormatNameTo(gCommonFormatArgs);
|
w->widgets[WIDX_TITLE].text = STR_ARG_16_STRINGID;
|
||||||
|
ride->FormatNameTo(gCommonFormatArgs + 16);
|
||||||
|
|
||||||
// Track colours
|
// Track colours
|
||||||
int32_t colourScheme = w->ride_colour;
|
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);
|
window_ride_set_pressed_tab(w);
|
||||||
|
|
||||||
Ride* ride = get_ride(w->number);
|
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();
|
rideEntry = ride->GetRideEntry();
|
||||||
|
|
||||||
|
|
|
@ -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, 0, rct_string_id, STR_ON_RIDE);
|
||||||
set_format_arg_on(args, 2, rct_string_id, STR_NONE);
|
set_format_arg_on(args, 2, rct_string_id, STR_NONE);
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
case PEEP_STATE_BUYING:
|
case PEEP_STATE_BUYING:
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue