diff --git a/src/management/research.c b/src/management/research.c index f50a7f6c24..2544c78d48 100644 --- a/src/management/research.c +++ b/src/management/research.c @@ -164,7 +164,7 @@ void research_finish_item(sint32 entryIndex) rct_ride_entry *rideEntry, *rideEntry2; rct_scenery_set_entry *scenerySetEntry; - RCT2_GLOBAL(RCT2_ADDRESS_LAST_RESEARCHED_ITEM_SUBJECT, sint32) = entryIndex; + gResearchLastItemSubject = (uint32)entryIndex; research_invalidate_related_windows(); if (entryIndex >= 0x10000) { // Ride @@ -330,7 +330,7 @@ void sub_684AC3(){ research_finish_item(research->entryIndex); } - RCT2_GLOBAL(RCT2_ADDRESS_LAST_RESEARCHED_ITEM_SUBJECT, sint32) = -1; + gResearchLastItemSubject = (uint32)-1; gResearchProgressStage = 0; gResearchProgress = 0; } diff --git a/src/management/research.h b/src/management/research.h index eb90da2078..595061f489 100644 --- a/src/management/research.h +++ b/src/management/research.h @@ -66,6 +66,7 @@ enum { #define gResearchPriorities RCT2_GLOBAL(RCT2_ADDRESS_ACTIVE_RESEARCH_TYPES, uint8) #define gResearchProgress RCT2_GLOBAL(RCT2_ADDRESS_RESEARH_PROGRESS, uint16) #define gResearchProgressStage RCT2_GLOBAL(RCT2_ADDRESS_RESEARH_PROGRESS_STAGE, uint8) +#define gResearchLastItemSubject RCT2_GLOBAL(RCT2_ADDRESS_LAST_RESEARCHED_ITEM_SUBJECT, uint32) #define gResearchExpectedMonth RCT2_GLOBAL(RCT2_ADDRESS_NEXT_RESEARCH_EXPECTED_MONTH, uint8) #define gResearchExpectedDay RCT2_GLOBAL(RCT2_ADDRESS_NEXT_RESEARCH_EXPECTED_DAY, uint8) #define gResearchNextCategory RCT2_GLOBAL(RCT2_ADDRESS_NEXT_RESEARCH_CATEGORY, uint8) diff --git a/src/rct2/S6Exporter.cpp b/src/rct2/S6Exporter.cpp index 6db7bd215d..3b659cb8da 100644 --- a/src/rct2/S6Exporter.cpp +++ b/src/rct2/S6Exporter.cpp @@ -304,7 +304,7 @@ void S6Exporter::Export() _s6.active_research_types = gResearchPriorities; _s6.research_progress_stage = gResearchProgressStage; - _s6.last_researched_item_subject = RCT2_GLOBAL(RCT2_ADDRESS_LAST_RESEARCHED_ITEM_SUBJECT, uint32); + _s6.last_researched_item_subject = gResearchLastItemSubject; // pad_01357CF8 _s6.next_research_item = gResearchNextItem; _s6.research_progress = gResearchProgress; diff --git a/src/rct2/S6Importer.cpp b/src/rct2/S6Importer.cpp index 4a884a37e1..2268a8abeb 100644 --- a/src/rct2/S6Importer.cpp +++ b/src/rct2/S6Importer.cpp @@ -236,7 +236,7 @@ void S6Importer::Import() gResearchPriorities = _s6.active_research_types; gResearchProgressStage = _s6.research_progress_stage; - RCT2_GLOBAL(RCT2_ADDRESS_LAST_RESEARCHED_ITEM_SUBJECT, uint32) = _s6.last_researched_item_subject; + gResearchLastItemSubject = _s6.last_researched_item_subject; // pad_01357CF8 gResearchNextItem = _s6.next_research_item; gResearchProgress = _s6.research_progress; diff --git a/src/windows/new_ride.c b/src/windows/new_ride.c index 30c08b0303..e9305e55ca 100644 --- a/src/windows/new_ride.c +++ b/src/windows/new_ride.c @@ -617,7 +617,7 @@ static void window_new_ride_mouseup(rct_window *w, int widgetIndex) window_close(w); break; case WIDX_LAST_DEVELOPMENT_BUTTON: - news_item_open_subject(NEWS_ITEM_RESEARCH, RCT2_GLOBAL(RCT2_ADDRESS_LAST_RESEARCHED_ITEM_SUBJECT, sint32)); + news_item_open_subject(NEWS_ITEM_RESEARCH, (int)gResearchLastItemSubject); break; case WIDX_RESEARCH_FUNDING_BUTTON: window_finances_research_open(); @@ -739,7 +739,7 @@ static void window_new_ride_invalidate(rct_window *w) if (_window_new_ride_current_tab == WINDOW_NEW_RIDE_PAGE_RESEARCH) { window_new_ride_widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WWT_EMPTY; - uint32 typeId = RCT2_GLOBAL(RCT2_ADDRESS_LAST_RESEARCHED_ITEM_SUBJECT, uint32); + uint32 typeId = gResearchLastItemSubject; if (typeId != 0xFFFFFFFF) { window_new_ride_widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WWT_FLATBTN; window_new_ride_widgets[WIDX_LAST_DEVELOPMENT_BUTTON].image = typeId >= 0x10000 ? 5189 : 5191; diff --git a/src/windows/research.c b/src/windows/research.c index 4a9608ee3e..5ef054966c 100644 --- a/src/windows/research.c +++ b/src/windows/research.c @@ -266,7 +266,7 @@ static void window_research_development_mouseup(rct_window *w, int widgetIndex) window_research_set_page(w, widgetIndex - WIDX_TAB_1); break; case WIDX_LAST_DEVELOPMENT_BUTTON: - news_item_open_subject(NEWS_ITEM_RESEARCH, RCT2_GLOBAL(RCT2_ADDRESS_LAST_RESEARCHED_ITEM_SUBJECT, sint32)); + news_item_open_subject(NEWS_ITEM_RESEARCH, (int)gResearchLastItemSubject); break; } } @@ -299,7 +299,7 @@ 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; - uint32 typeId = RCT2_GLOBAL(RCT2_ADDRESS_LAST_RESEARCHED_ITEM_SUBJECT, uint32); + uint32 typeId = gResearchLastItemSubject; if (typeId != 0xFFFFFFFF) { window_research_development_widgets[WIDX_LAST_DEVELOPMENT_BUTTON].type = WWT_FLATBTN; window_research_development_widgets[WIDX_LAST_DEVELOPMENT_BUTTON].image = typeId >= 0x10000 ? 5189 : 5191; @@ -380,7 +380,7 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp x = w->x + 10; y = w->y + w->widgets[WIDX_LAST_DEVELOPMENT_GROUP + baseWidgetIndex].top + 12; - uint32 typeId = RCT2_GLOBAL(RCT2_ADDRESS_LAST_RESEARCHED_ITEM_SUBJECT, uint32); + uint32 typeId = gResearchLastItemSubject; int lastDevelopmentFormat; if (typeId != 0xFFFFFFFF) { if (typeId >= 0x10000) { diff --git a/src/world/park.c b/src/world/park.c index 8e9ecb4ffc..725446b0b3 100644 --- a/src/world/park.c +++ b/src/world/park.c @@ -89,7 +89,7 @@ void park_init() gParkRating = 0; _guestGenerationProbability = 0; gTotalRideValue = 0; - RCT2_GLOBAL(RCT2_ADDRESS_LAST_RESEARCHED_ITEM_SUBJECT, sint32) = -1; + gResearchLastItemSubject = (uint32)-1; for (i = 0; i < 20; i++) gMarketingCampaignDaysLeft[i] = 0;