From d8ffec0ed77e9eaf800804233044b74453f1f8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Thu, 10 Sep 2020 21:01:14 +0200 Subject: [PATCH] Use correct count of research items when importing park Co-authored-by: Hielke Morsink Co-authored-by: Michael Steenbeek --- src/openrct2/rct2/S6Importer.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 7195390148..9fe5a457f6 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -919,23 +919,22 @@ public: void ImportResearchList() { bool invented = true; - for (size_t i = 0; i < sizeof(_s6.research_items); i++) + for (const auto& researchItem : _s6.research_items) { - if (_s6.research_items[i].IsInventedEndMarker()) + if (researchItem.IsInventedEndMarker()) { invented = false; continue; } - else if (_s6.research_items[i].IsUninventedEndMarker() || _s6.research_items[i].IsRandomEndMarker()) + else if (researchItem.IsUninventedEndMarker() || researchItem.IsRandomEndMarker()) { break; } - RCT12ResearchItem* ri = &_s6.research_items[i]; if (invented) - gResearchItemsInvented.push_back(ResearchItem(*ri)); + gResearchItemsInvented.push_back(ResearchItem(researchItem)); else - gResearchItemsUninvented.push_back(ResearchItem(*ri)); + gResearchItemsUninvented.push_back(ResearchItem(researchItem)); } }