diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 9719a31a6a..0f7fb55671 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -357,7 +357,7 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp stringId = STR_RESEARCH_UNKNOWN; if (gResearchProgressStage != RESEARCH_STAGE_INITIAL_RESEARCH) { - stringId = ResearchCategoryNames[gResearchNextCategory]; + stringId = ResearchCategoryNames[gResearchNextItem.category]; if (gResearchProgressStage != RESEARCH_STAGE_DESIGNING) { stringId = research_item_get_name(&gResearchNextItem); diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index c571268af8..8bcf34f486 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -45,7 +45,6 @@ uint8 gResearchProgressStage; rct_research_item gResearchLastItem; uint8 gResearchExpectedMonth; uint8 gResearchExpectedDay; -uint8 gResearchNextCategory; rct_research_item gResearchNextItem; // 0x01358844[500] @@ -171,7 +170,6 @@ static void research_next_design() } gResearchNextItem = *researchItem; - gResearchNextCategory = researchItem->category; gResearchProgress = 0; gResearchProgressStage = RESEARCH_STAGE_DESIGNING; @@ -437,8 +435,8 @@ void research_reset_current_item() } gResearchLastItem.rawValue = RESEARCHED_ITEMS_SEPARATOR; - gResearchProgressStage = 0; - gResearchProgress = 0; + gResearchProgressStage = RESEARCH_STAGE_INITIAL_RESEARCH; + gResearchProgress = 0; } /** diff --git a/src/openrct2/management/Research.h b/src/openrct2/management/Research.h index 4d572a35f0..39b40b0887 100644 --- a/src/openrct2/management/Research.h +++ b/src/openrct2/management/Research.h @@ -104,7 +104,6 @@ extern uint16 gResearchProgress; extern uint8 gResearchProgressStage; extern uint8 gResearchExpectedMonth; extern uint8 gResearchExpectedDay; -extern uint8 gResearchNextCategory; extern rct_research_item gResearchLastItem; extern rct_research_item gResearchNextItem; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index ee5e62b25b..4c7204c4cb 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -2052,7 +2052,6 @@ private: gResearchProgress = _s4.research_progress; // gResearchProgressStage = gResearchNextItem.rawValue = _s4.next_research_item; - gResearchNextCategory = _s4.next_research_type; // gResearchExpectedDay = // gResearchExpectedMonth = diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 3488c58d4c..40c36d6797 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -251,7 +251,7 @@ void S6Exporter::Export() // pad_01357CF8 _s6.next_research_item = gResearchNextItem.rawValue; _s6.research_progress = gResearchProgress; - _s6.next_research_category = gResearchNextCategory; + _s6.next_research_category = gResearchNextItem.category; _s6.next_research_expected_day = gResearchExpectedDay; _s6.next_research_expected_month = gResearchExpectedMonth; _s6.guest_initial_happiness = gGuestInitialHappiness; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 481bdf925b..39b606fb9e 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -266,11 +266,11 @@ public: gResearchPriorities = _s6.active_research_types; gResearchProgressStage = _s6.research_progress_stage; - gResearchLastItem.rawValue = _s6.last_researched_item_subject; + gResearchLastItem.rawValue = _s6.last_researched_item_subject; // pad_01357CF8 - gResearchNextItem.rawValue = _s6.next_research_item; + gResearchNextItem.rawValue = _s6.next_research_item; gResearchProgress = _s6.research_progress; - gResearchNextCategory = _s6.next_research_category; + gResearchNextItem.category = _s6.next_research_category; gResearchExpectedDay = _s6.next_research_expected_day; gResearchExpectedMonth = _s6.next_research_expected_month; gGuestInitialHappiness = _s6.guest_initial_happiness;