diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 5962103cc5..d98c532173 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -686,7 +686,7 @@ static void window_new_ride_mouseup(rct_window *w, rct_widgetindex widgetIndex) window_close(w); break; case WIDX_LAST_DEVELOPMENT_BUTTON: - news_item_open_subject(NEWS_ITEM_RESEARCH, gResearchLastItemSubject.rawValue); + news_item_open_subject(NEWS_ITEM_RESEARCH, gResearchLastItem.rawValue); break; case WIDX_RESEARCH_FUNDING_BUTTON: context_open_window_view(WV_FINANCES_RESEARCH); @@ -804,9 +804,9 @@ static void window_new_ride_invalidate(rct_window *w) if (_windowNewRideCurrentTab == WINDOW_NEW_RIDE_PAGE_RESEARCH) { window_new_ride_widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WWT_EMPTY; - if (gResearchLastItemSubject.rawValue != RESEARCHED_ITEMS_SEPARATOR) + if (gResearchLastItem.rawValue != RESEARCHED_ITEMS_SEPARATOR) { - uint8 type = gResearchLastItemSubject.type; + uint8 type = gResearchLastItem.type; window_new_ride_widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WWT_FLATBTN; window_new_ride_widgets[WIDX_LAST_DEVELOPMENT_BUTTON].image = (type == RESEARCH_ENTRY_TYPE_RIDE) ? SPR_NEW_RIDE : SPR_NEW_SCENERY; diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index d0d684c0c2..7324741636 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -281,7 +281,7 @@ static void window_research_development_mouseup(rct_window *w, rct_widgetindex w window_research_set_page(w, widgetIndex - WIDX_TAB_1); break; case WIDX_LAST_DEVELOPMENT_BUTTON: - news_item_open_subject(NEWS_ITEM_RESEARCH, gResearchLastItemSubject.rawValue); + news_item_open_subject(NEWS_ITEM_RESEARCH, gResearchLastItem.rawValue); break; } } @@ -312,9 +312,9 @@ static void window_research_development_invalidate(rct_window *w) window_research_set_pressed_tab(w); window_research_development_widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WWT_EMPTY; - if (gResearchLastItemSubject.rawValue != RESEARCHED_ITEMS_SEPARATOR) + if (gResearchLastItem.rawValue != RESEARCHED_ITEMS_SEPARATOR) { - uint8 type = gResearchLastItemSubject.type; + uint8 type = gResearchLastItem.type; window_research_development_widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WWT_FLATBTN; window_research_development_widgets[WIDX_LAST_DEVELOPMENT_BUTTON].image = type == RESEARCH_ENTRY_TYPE_RIDE? SPR_NEW_RIDE : SPR_NEW_SCENERY; } @@ -390,10 +390,10 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp y = w->y + w->widgets[WIDX_LAST_DEVELOPMENT_GROUP + baseWidgetIndex].top + 12; rct_string_id lastDevelopmentFormat; - if (gResearchLastItemSubject.rawValue != RESEARCHED_ITEMS_SEPARATOR) + if (gResearchLastItem.rawValue != RESEARCHED_ITEMS_SEPARATOR) { stringId = research_item_get_name(&gResearchNextItem); - uint8 type = gResearchLastItemSubject.type; + uint8 type = gResearchLastItem.type; lastDevelopmentFormat = (type == RESEARCH_ENTRY_TYPE_RIDE) ? STR_RESEARCH_RIDE_LABEL : STR_RESEARCH_SCENERY_LABEL; gfx_draw_string_left_wrapped(dpi, &stringId, x, y, 266, lastDevelopmentFormat, COLOUR_BLACK); diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 8bf737f975..2b5a6806fa 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -42,7 +42,7 @@ uint8 gResearchFundingLevel; uint8 gResearchPriorities; uint16 gResearchProgress; uint8 gResearchProgressStage; -rct_research_item gResearchLastItemSubject; +rct_research_item gResearchLastItem; uint8 gResearchExpectedMonth; uint8 gResearchExpectedDay; uint8 gResearchNextCategory; @@ -196,7 +196,7 @@ static void research_next_design() */ void research_finish_item(rct_research_item * researchItem) { - gResearchLastItemSubject = *researchItem; + gResearchLastItem = *researchItem; research_invalidate_related_windows(); if (researchItem->type == RESEARCH_ENTRY_TYPE_RIDE) @@ -442,7 +442,7 @@ void research_reset_current_item() research_finish_item(research); } - gResearchLastItemSubject.rawValue = RESEARCHED_ITEMS_SEPARATOR; + gResearchLastItem.rawValue = RESEARCHED_ITEMS_SEPARATOR; gResearchProgressStage = 0; gResearchProgress = 0; } diff --git a/src/openrct2/management/Research.h b/src/openrct2/management/Research.h index f742ab61ac..bbf3409f1c 100644 --- a/src/openrct2/management/Research.h +++ b/src/openrct2/management/Research.h @@ -102,10 +102,10 @@ extern uint8 gResearchFundingLevel; extern uint8 gResearchPriorities; extern uint16 gResearchProgress; extern uint8 gResearchProgressStage; -extern rct_research_item gResearchLastItemSubject; extern uint8 gResearchExpectedMonth; extern uint8 gResearchExpectedDay; extern uint8 gResearchNextCategory; +extern rct_research_item gResearchLastItem; extern rct_research_item gResearchNextItem; extern rct_research_item gResearchItems[MAX_RESEARCH_ITEMS]; diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 56d089ad6d..814c7aac7f 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -247,7 +247,7 @@ void S6Exporter::Export() _s6.active_research_types = gResearchPriorities; _s6.research_progress_stage = gResearchProgressStage; - _s6.last_researched_item_subject = gResearchLastItemSubject.rawValue; + _s6.last_researched_item_subject = gResearchLastItem.rawValue; // pad_01357CF8 _s6.next_research_item = gResearchNextItem.rawValue; _s6.research_progress = gResearchProgress; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 43a7597d8a..7549e5257f 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -265,7 +265,7 @@ public: gResearchPriorities = _s6.active_research_types; gResearchProgressStage = _s6.research_progress_stage; - gResearchLastItemSubject.rawValue = _s6.last_researched_item_subject; + gResearchLastItem.rawValue = _s6.last_researched_item_subject; // pad_01357CF8 gResearchNextItem.rawValue = _s6.next_research_item; gResearchProgress = _s6.research_progress; diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 6e7cef4faa..28b58bebc8 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -101,7 +101,7 @@ void park_init() gParkRating = 0; _guestGenerationProbability = 0; gTotalRideValueForMoney = 0; - gResearchLastItemSubject.rawValue = RESEARCHED_ITEMS_SEPARATOR; + gResearchLastItem.rawValue = RESEARCHED_ITEMS_SEPARATOR; for (i = 0; i < 20; i++) gMarketingCampaignDaysLeft[i] = 0;