From c3fdb728d1dab07d4284ddc4373cda0af3fcc296 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sun, 16 Jun 2019 21:21:06 +0200 Subject: [PATCH] Rename rct_research_item to ResearchItem --- .../windows/EditorInventionsList.cpp | 42 +++++++-------- src/openrct2/EditorObjectSelectionSession.cpp | 4 +- src/openrct2/interface/Window_internal.h | 4 +- src/openrct2/management/Research.cpp | 52 +++++++++---------- src/openrct2/management/Research.h | 18 +++---- src/openrct2/rct1/S4Importer.cpp | 4 +- 6 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index ea7004781c..e4472402d4 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -84,7 +84,7 @@ static void window_editor_inventions_list_drag_cursor(rct_window *w, rct_widgeti static void window_editor_inventions_list_drag_moved(rct_window* w, int32_t x, int32_t y); static void window_editor_inventions_list_drag_paint(rct_window *w, rct_drawpixelinfo *dpi); -static rct_string_id window_editor_inventions_list_prepare_name(const rct_research_item * researchItem, bool withGap); +static rct_string_id window_editor_inventions_list_prepare_name(const ResearchItem * researchItem, bool withGap); // 0x0098177C static rct_window_event_list window_editor_inventions_list_events = { @@ -152,7 +152,7 @@ static rct_window_event_list window_editor_inventions_list_drag_events = { #pragma endregion -static rct_research_item *_editorInventionsListDraggedItem; +static ResearchItem *_editorInventionsListDraggedItem; static constexpr const rct_string_id EditorInventionsResearchCategories[] = { STR_RESEARCH_NEW_TRANSPORT_RIDES, @@ -165,8 +165,8 @@ static constexpr const rct_string_id EditorInventionsResearchCategories[] = { }; // clang-format on -static void window_editor_inventions_list_drag_open(rct_research_item* researchItem); -static void move_research_item(rct_research_item* beforeItem); +static void window_editor_inventions_list_drag_open(ResearchItem* researchItem); +static void move_research_item(ResearchItem* beforeItem); /** * @@ -196,10 +196,10 @@ static void research_rides_setup() * * rct2: 0x006855E7 */ -static void move_research_item(rct_research_item* beforeItem) +static void move_research_item(ResearchItem* beforeItem) { rct_window* w; - rct_research_item *researchItem, draggedItem; + ResearchItem *researchItem, draggedItem; if (_editorInventionsListDraggedItem + 1 == beforeItem) return; @@ -240,9 +240,9 @@ static void move_research_item(rct_research_item* beforeItem) * * rct2: 0x0068558E */ -static rct_research_item* window_editor_inventions_list_get_item_from_scroll_y(int32_t scrollIndex, int32_t y) +static ResearchItem* window_editor_inventions_list_get_item_from_scroll_y(int32_t scrollIndex, int32_t y) { - rct_research_item* researchItem; + ResearchItem* researchItem; researchItem = gResearchItems; @@ -272,9 +272,9 @@ static rct_research_item* window_editor_inventions_list_get_item_from_scroll_y(i * * rct2: 0x006855BB */ -static rct_research_item* window_editor_inventions_list_get_item_from_scroll_y_include_seps(int32_t scrollIndex, int32_t y) +static ResearchItem* window_editor_inventions_list_get_item_from_scroll_y_include_seps(int32_t scrollIndex, int32_t y) { - rct_research_item* researchItem; + ResearchItem* researchItem; researchItem = gResearchItems; @@ -300,7 +300,7 @@ static rct_research_item* window_editor_inventions_list_get_item_from_scroll_y_i return researchItem; } -static rct_research_item* get_research_item_at(int32_t x, int32_t y) +static ResearchItem* get_research_item_at(int32_t x, int32_t y) { rct_window* w = window_find_by_class(WC_EDITOR_INVENTION_LIST); if (w != nullptr && w->x <= x && w->y < y && w->x + w->width > x && w->y + w->height > y) @@ -443,7 +443,7 @@ 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) { - rct_research_item* researchItem; + ResearchItem* researchItem; *height = 0; @@ -468,7 +468,7 @@ static void window_editor_inventions_list_scrollgetheight(rct_window* w, int32_t */ static void window_editor_inventions_list_scrollmousedown(rct_window* w, int32_t scrollIndex, int32_t x, int32_t y) { - rct_research_item* researchItem; + ResearchItem* researchItem; researchItem = window_editor_inventions_list_get_item_from_scroll_y(scrollIndex, y); if (researchItem == nullptr) @@ -488,7 +488,7 @@ static void window_editor_inventions_list_scrollmousedown(rct_window* w, int32_t */ static void window_editor_inventions_list_scrollmouseover(rct_window* w, int32_t scrollIndex, int32_t x, int32_t y) { - rct_research_item* researchItem; + ResearchItem* researchItem; researchItem = window_editor_inventions_list_get_item_from_scroll_y(scrollIndex, y); if (researchItem != w->research_item) @@ -511,7 +511,7 @@ static void window_editor_inventions_list_scrollmouseover(rct_window* w, int32_t static void window_editor_inventions_list_cursor( rct_window* w, rct_widgetindex widgetIndex, int32_t x, int32_t y, int32_t* cursorId) { - rct_research_item* researchItem; + ResearchItem* researchItem; int32_t scrollIndex; switch (widgetIndex) @@ -589,7 +589,7 @@ static void window_editor_inventions_list_invalidate(rct_window* w) static void window_editor_inventions_list_paint(rct_window* w, rct_drawpixelinfo* dpi) { rct_widget* widget; - rct_research_item* researchItem; + ResearchItem* researchItem; rct_string_id stringId; int32_t x, y, width; @@ -676,7 +676,7 @@ static void window_editor_inventions_list_scrollpaint(rct_window* w, rct_drawpix uint8_t paletteIndex = ColourMapA[w->colours[1]].mid_light; gfx_clear(dpi, paletteIndex); - rct_research_item* researchItem = gResearchItems; + ResearchItem* researchItem = gResearchItems; int32_t researchItemEndMarker; if (scrollIndex == 1) @@ -786,7 +786,7 @@ static void window_editor_inventions_list_scrollpaint(rct_window* w, rct_drawpix * * rct2: 0x006852F4 */ -static void window_editor_inventions_list_drag_open(rct_research_item* researchItem) +static void window_editor_inventions_list_drag_open(ResearchItem* researchItem) { char buffer[256], *ptr; int32_t stringWidth; @@ -833,7 +833,7 @@ static void window_editor_inventions_list_drag_cursor( rct_window* inventionListWindow = window_find_by_class(WC_EDITOR_INVENTION_LIST); if (inventionListWindow != nullptr) { - rct_research_item* researchItem = get_research_item_at(x, y); + ResearchItem* researchItem = get_research_item_at(x, y); if (researchItem != inventionListWindow->research_item) { inventionListWindow->Invalidate(); @@ -849,7 +849,7 @@ static void window_editor_inventions_list_drag_cursor( */ static void window_editor_inventions_list_drag_moved(rct_window* w, int32_t x, int32_t y) { - rct_research_item* researchItem; + ResearchItem* researchItem; // Skip always researched items, so that the dragged item gets placed underneath them do @@ -881,7 +881,7 @@ static void window_editor_inventions_list_drag_paint(rct_window* w, rct_drawpixe gfx_draw_string_left(dpi, drawString, gCommonFormatArgs, COLOUR_BLACK | COLOUR_FLAG_OUTLINE, x, y); } -static rct_string_id window_editor_inventions_list_prepare_name(const rct_research_item* researchItem, bool withGap) +static rct_string_id window_editor_inventions_list_prepare_name(const ResearchItem* researchItem, bool withGap) { rct_string_id drawString; rct_string_id stringId = research_item_get_name(researchItem); diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index a8bc528557..54a3073357 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -292,7 +292,7 @@ static void remove_selected_objects_from_research(const rct_object_entry* instal for (auto rideType : rideEntry->ride_type) { - rct_research_item tmp = {}; + ResearchItem tmp = {}; tmp.type = RESEARCH_ENTRY_TYPE_RIDE; tmp.entryIndex = entry_index; tmp.baseRideType = rideType; @@ -301,7 +301,7 @@ static void remove_selected_objects_from_research(const rct_object_entry* instal } else if (entry_type == OBJECT_TYPE_SCENERY_GROUP) { - rct_research_item tmp = {}; + ResearchItem tmp = {}; tmp.type = RESEARCH_ENTRY_TYPE_SCENERY; tmp.entryIndex = entry_index; research_remove(&tmp); diff --git a/src/openrct2/interface/Window_internal.h b/src/openrct2/interface/Window_internal.h index 1bac5b17c1..5297737acb 100644 --- a/src/openrct2/interface/Window_internal.h +++ b/src/openrct2/interface/Window_internal.h @@ -14,7 +14,7 @@ #include #include -struct rct_research_item; +struct ResearchItem; struct rct_object_entry; /** @@ -79,7 +79,7 @@ struct rct_window { // 0x494 uint32_t highlighted_item; uint16_t ride_colour; - rct_research_item* research_item; + ResearchItem* research_item; rct_object_entry* object_entry; const scenario_index_entry* highlighted_scenario; struct diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 48f10c4743..81dac49050 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -46,13 +46,13 @@ uint8_t gResearchFundingLevel; uint8_t gResearchPriorities; uint16_t gResearchProgress; uint8_t gResearchProgressStage; -rct_research_item gResearchLastItem; +ResearchItem gResearchLastItem; uint8_t gResearchExpectedMonth; uint8_t gResearchExpectedDay; -rct_research_item gResearchNextItem; +ResearchItem gResearchNextItem; // 0x01358844[500] -rct_research_item gResearchItems[MAX_RESEARCH_ITEMS]; +ResearchItem gResearchItems[MAX_RESEARCH_ITEMS]; // 0x00EE787C uint8_t gResearchUncompletedCategories; @@ -81,7 +81,7 @@ void research_reset_items() void research_update_uncompleted_types() { int32_t uncompletedResearchTypes = 0; - rct_research_item* researchItem = gResearchItems; + ResearchItem* researchItem = gResearchItems; while (researchItem++->rawValue != RESEARCHED_ITEMS_SEPARATOR) ; @@ -133,7 +133,7 @@ static void research_invalidate_related_windows() */ static void research_next_design() { - rct_research_item *firstUnresearchedItem, *researchItem, tmp; + ResearchItem *firstUnresearchedItem, *researchItem, tmp; int32_t ignoreActiveResearchTypes; // Skip already researched items @@ -193,7 +193,7 @@ static void research_next_design() * * rct2: 0x006848D4 */ -void research_finish_item(rct_research_item* researchItem) +void research_finish_item(ResearchItem* researchItem) { gResearchLastItem = *researchItem; research_invalidate_related_windows(); @@ -230,7 +230,7 @@ void research_finish_item(rct_research_item* researchItem) bool seenRideEntry[MAX_RIDE_OBJECTS]{}; - rct_research_item* researchItem2 = gResearchItems; + ResearchItem* researchItem2 = gResearchItems; for (; researchItem2->rawValue != RESEARCHED_ITEMS_END; researchItem2++) { if (researchItem2->rawValue != RESEARCHED_ITEMS_SEPARATOR && researchItem2->type == RESEARCH_ENTRY_TYPE_RIDE) @@ -388,7 +388,7 @@ void research_update() void research_process_random_items() { - rct_research_item* research = gResearchItems; + ResearchItem* research = gResearchItems; for (; research->rawValue != RESEARCHED_ITEMS_END; research++) { } @@ -401,9 +401,9 @@ void research_process_random_items() continue; } - rct_research_item* edx = nullptr; - rct_research_item* ebp = nullptr; - rct_research_item* inner_research = gResearchItems; + ResearchItem* edx = nullptr; + ResearchItem* ebp = nullptr; + ResearchItem* inner_research = gResearchItems; do { if (research->rawValue == inner_research->rawValue) @@ -441,7 +441,7 @@ void research_reset_current_item() set_all_scenery_items_invented(); set_all_scenery_groups_not_invented(); - for (rct_research_item* research = gResearchItems; research->rawValue != RESEARCHED_ITEMS_SEPARATOR; research++) + for (ResearchItem* research = gResearchItems; research->rawValue != RESEARCHED_ITEMS_SEPARATOR; research++) { research_finish_item(research); } @@ -457,7 +457,7 @@ void research_reset_current_item() */ static void research_insert_unresearched(int32_t rawValue, int32_t category) { - rct_research_item *researchItem, *researchItem2; + ResearchItem *researchItem, *researchItem2; researchItem = gResearchItems; do @@ -470,7 +470,7 @@ static void research_insert_unresearched(int32_t rawValue, int32_t category) { researchItem2++; } - memmove(researchItem + 1, researchItem, (researchItem2 - researchItem + 1) * sizeof(rct_research_item)); + memmove(researchItem + 1, researchItem, (researchItem2 - researchItem + 1) * sizeof(ResearchItem)); // Place new item researchItem->rawValue = rawValue; @@ -486,7 +486,7 @@ static void research_insert_unresearched(int32_t rawValue, int32_t category) */ static void research_insert_researched(int32_t rawValue, uint8_t category) { - rct_research_item *researchItem, *researchItem2; + ResearchItem *researchItem, *researchItem2; researchItem = gResearchItems; // First check to make sure that entry is not already accounted for @@ -508,7 +508,7 @@ static void research_insert_researched(int32_t rawValue, uint8_t category) { researchItem2++; } - memmove(researchItem + 1, researchItem, (researchItem2 - researchItem + 1) * sizeof(rct_research_item)); + memmove(researchItem + 1, researchItem, (researchItem2 - researchItem + 1) * sizeof(ResearchItem)); // Place new item researchItem->rawValue = rawValue; @@ -522,9 +522,9 @@ static void research_insert_researched(int32_t rawValue, uint8_t category) * * rct2: 0x006857CF */ -void research_remove(rct_research_item* researchItem) +void research_remove(ResearchItem* researchItem) { - for (rct_research_item* researchItem2 = gResearchItems; researchItem2->rawValue != RESEARCHED_ITEMS_END; researchItem2++) + for (ResearchItem* researchItem2 = gResearchItems; researchItem2->rawValue != RESEARCHED_ITEMS_END; researchItem2++) { if (researchItem2->rawValue == researchItem->rawValue) { @@ -773,7 +773,7 @@ void set_every_ride_entry_not_invented() * * rct2: 0x0068563D */ -rct_string_id research_item_get_name(const rct_research_item* researchItem) +rct_string_id research_item_get_name(const ResearchItem* researchItem) { if (researchItem->type == RESEARCH_ENTRY_TYPE_RIDE) { @@ -824,7 +824,7 @@ rct_string_id research_get_friendly_base_ride_type_name(uint8_t trackType, rct_r */ void research_remove_flags() { - for (rct_research_item* research = gResearchItems; research->rawValue != RESEARCHED_ITEMS_END_2; research++) + for (ResearchItem* research = gResearchItems; research->rawValue != RESEARCHED_ITEMS_END_2; research++) { // Clear the always researched flags. if (research->rawValue > RESEARCHED_ITEMS_SEPARATOR) @@ -839,7 +839,7 @@ void research_fix() // Fix invalid research items for (int32_t i = 0; i < MAX_RESEARCH_ITEMS; i++) { - rct_research_item* researchItem = &gResearchItems[i]; + ResearchItem* researchItem = &gResearchItems[i]; if (researchItem->rawValue == RESEARCHED_ITEMS_SEPARATOR) continue; if (researchItem->rawValue == RESEARCHED_ITEMS_END) @@ -914,7 +914,7 @@ void research_fix() void research_items_make_all_unresearched() { - rct_research_item *researchItem, *nextResearchItem, researchItemTemp; + ResearchItem *researchItem, *nextResearchItem, researchItemTemp; int32_t sorted; do @@ -944,7 +944,7 @@ void research_items_make_all_unresearched() void research_items_make_all_researched() { - rct_research_item *researchItem, researchItemTemp; + ResearchItem *researchItem, researchItemTemp; // Find separator for (researchItem = gResearchItems; researchItem->rawValue != RESEARCHED_ITEMS_SEPARATOR; researchItem++) @@ -967,7 +967,7 @@ void research_items_make_all_researched() */ void research_items_shuffle() { - rct_research_item *researchItem, *researchOrderBase, researchItemTemp; + ResearchItem *researchItem, *researchOrderBase, researchItemTemp; int32_t i, numNonResearchedItems; // Skip pre-researched items @@ -995,14 +995,14 @@ void research_items_shuffle() } } -bool research_item_is_always_researched(rct_research_item* researchItem) +bool research_item_is_always_researched(ResearchItem* researchItem) { return (researchItem->flags & (RESEARCH_ENTRY_FLAG_RIDE_ALWAYS_RESEARCHED | RESEARCH_ENTRY_FLAG_SCENERY_SET_ALWAYS_RESEARCHED)) != 0; } -bool rct_research_item::IsInventedEndMarker() const +bool ResearchItem::IsInventedEndMarker() const { return rawValue == RESEARCHED_ITEMS_SEPARATOR; } diff --git a/src/openrct2/management/Research.h b/src/openrct2/management/Research.h index 339d8115be..63c4b2d1e4 100644 --- a/src/openrct2/management/Research.h +++ b/src/openrct2/management/Research.h @@ -16,7 +16,7 @@ struct rct_ride_entry; #pragma pack(push, 1) -struct rct_research_item +struct ResearchItem { // Bit 16 (0: scenery entry, 1: ride entry) union @@ -36,7 +36,7 @@ struct rct_research_item bool IsRandomEndMarker() const; bool IsUninventedEndMarker() const; }; -assert_struct_size(rct_research_item, 5); +assert_struct_size(ResearchItem, 5); #pragma pack(pop) enum @@ -100,10 +100,10 @@ extern uint16_t gResearchProgress; extern uint8_t gResearchProgressStage; extern uint8_t gResearchExpectedMonth; extern uint8_t gResearchExpectedDay; -extern rct_research_item gResearchLastItem; -extern rct_research_item gResearchNextItem; +extern ResearchItem gResearchLastItem; +extern ResearchItem gResearchNextItem; -extern rct_research_item gResearchItems[MAX_RESEARCH_ITEMS]; +extern ResearchItem gResearchItems[MAX_RESEARCH_ITEMS]; extern uint8_t gResearchUncompletedCategories; extern bool gSilentResearch; @@ -115,9 +115,9 @@ void research_populate_list_random(); void research_populate_list_researched(); void research_process_random_items(); -void research_finish_item(rct_research_item* researchItem); +void research_finish_item(ResearchItem* researchItem); void research_insert(int32_t researched, int32_t rawValue, uint8_t category); -void research_remove(rct_research_item* researchItem); +void research_remove(ResearchItem* researchItem); void research_insert_ride_entry(uint8_t entryIndex, bool researched); void research_insert_scenery_group_entry(uint8_t entryIndex, bool researched); @@ -139,7 +139,7 @@ void set_every_ride_type_invented(); void set_every_ride_type_not_invented(); void set_every_ride_entry_invented(); void set_every_ride_entry_not_invented(); -rct_string_id research_item_get_name(const rct_research_item* researchItem); +rct_string_id research_item_get_name(const ResearchItem* researchItem); rct_string_id research_get_friendly_base_ride_type_name(uint8_t trackType, rct_ride_entry* rideEntry); void research_remove_flags(); void research_fix(); @@ -147,4 +147,4 @@ void research_fix(); void research_items_make_all_unresearched(); void research_items_make_all_researched(); void research_items_shuffle(); -bool research_item_is_always_researched(rct_research_item* researchItem); +bool research_item_is_always_researched(ResearchItem* researchItem); diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index ec2ecd1118..8cd788f202 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -2496,7 +2496,7 @@ private: uint8_t researchItem = src->Assoc & 0x000000FF; uint8_t researchType = (src->Assoc & 0x00FF0000) >> 16; - rct_research_item tmpResearchItem = {}; + ResearchItem tmpResearchItem = {}; ConvertResearchEntry(&tmpResearchItem, researchItem, researchType); dst->Assoc = (uint32_t)tmpResearchItem.rawValue; } @@ -2540,7 +2540,7 @@ private: gTotalRideValueForMoney = _s4.total_ride_value_for_money; } - void ConvertResearchEntry(rct_research_item* dst, uint8_t srcItem, uint8_t srcType) + void ConvertResearchEntry(ResearchItem* dst, uint8_t srcItem, uint8_t srcType) { dst->rawValue = RESEARCHED_ITEMS_SEPARATOR; if (srcType == RCT1_RESEARCH_TYPE_RIDE)