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

Add trailing commas to some window source files

This commit is contained in:
Hielke Morsink 2018-07-23 14:10:54 +02:00
parent 7eafeaa971
commit 25eea49983
3 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/openrct2-ui/windows/DemolishRidePrompt.cpp
View File

@ -84,38 +84,40 @@ static rct_window_event_list window_ride_demolish_events = {
nullptr,
nullptr,
window_ride_demolish_paint,
nullptr
nullptr,
};
// clang-format on
static rct_window_event_list window_ride_refurbish_events = { nullptr,
window_ride_refurbish_mouseup,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
window_ride_refurbish_paint,
nullptr };
static rct_window_event_list window_ride_refurbish_events = {
nullptr,
window_ride_refurbish_mouseup,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
window_ride_refurbish_paint,
nullptr,
};
/** Based off of rct2: 0x006B486A */
rct_window* window_ride_demolish_prompt_open(int32_t rideIndex)

5
src/openrct2-ui/windows/Dropdown.cpp
View File

@ -22,8 +22,9 @@
#define DROPDOWN_ITEM_HEIGHT 12
int32_t gAppropriateImageDropdownItemsPerRow[] = { 1, 1, 1, 1, 2, 2, 3, 3, 4, 3, 5, 4, 4, 5, 5, 5, 4,
5, 6, 5, 5, 7, 4, 5, 6, 5, 6, 6, 6, 6, 6, 8, 8, 0 };
int32_t gAppropriateImageDropdownItemsPerRow[] = {
1, 1, 1, 1, 2, 2, 3, 3, 4, 3, 5, 4, 4, 5, 5, 5, 4, 5, 6, 5, 5, 7, 4, 5, 6, 5, 6, 6, 6, 6, 6, 8, 8, 0,
};
enum
{

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

@ -811,9 +811,8 @@ static void window_editor_inventions_list_scrollpaint(rct_window* w, rct_drawpix
if (researchItem->type == RESEARCH_ENTRY_TYPE_RIDE
&& !RideGroupManager::RideTypeIsIndependent(researchItem->baseRideType))
{
const rct_string_id rideGroupName = get_ride_naming(
researchItem->baseRideType, get_ride_entry(researchItem->entryIndex))
.name;
const auto rideEntry = get_ride_entry(researchItem->entryIndex);
const rct_string_id rideGroupName = get_ride_naming(researchItem->baseRideType, rideEntry).name;
format_string(
groupNamePtr, Util::CountOf(groupNameBuffer), STR_INVENTIONS_LIST_RIDE_AND_VEHICLE_NAME, (void*)&rideGroupName);
format_string(vehicleNamePtr, Util::CountOf(vehicleNameBuffer), itemNameId, nullptr);
@ -856,10 +855,12 @@ static void window_editor_inventions_list_drag_open(rct_research_item* researchI
ptr = buffer;
if (researchItem->type == RESEARCH_ENTRY_TYPE_RIDE && !RideGroupManager::RideTypeIsIndependent(researchItem->baseRideType))
{
const rct_string_id rideGroupName = get_ride_naming(
researchItem->baseRideType, get_ride_entry(researchItem->entryIndex))
.name;
rct_string_id args[] = { rideGroupName, stringId };
const auto rideEntry = get_ride_entry(researchItem->entryIndex);
const rct_string_id rideGroupName = get_ride_naming(researchItem->baseRideType, rideEntry).name;
rct_string_id args[] = {
rideGroupName,
stringId,
};
format_string(ptr, 256, STR_INVENTIONS_LIST_RIDE_AND_VEHICLE_NAME, &args);
}
else