From 13be47f3892c78a5fc373b4eaee0d29a3f69030e Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Wed, 19 Mar 2025 15:31:29 +0100
Subject: [PATCH] Apply review requests

---
 src/openrct2/management/NewsItem.cpp |  2 +-
 src/openrct2/management/NewsItem.h   | 23 ++++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp
index eb46193e3e..36410fb566 100644
--- a/src/openrct2/management/NewsItem.cpp
+++ b/src/openrct2/management/NewsItem.cpp
@@ -485,7 +485,7 @@ void News::RemoveItem(int32_t index)
 }
 
 void News::importNewsItems(
-    GameState_t& gameState, const std::vector<News::Item>& recent, const std::vector<News::Item>& archived)
+    GameState_t& gameState, const std::span<const News::Item> recent, const std::span<const News::Item> archived)
 {
     gameState.NewsItems.Clear();
 
diff --git a/src/openrct2/management/NewsItem.h b/src/openrct2/management/NewsItem.h
index 827b1457a4..4eb89d7fcc 100644
--- a/src/openrct2/management/NewsItem.h
+++ b/src/openrct2/management/NewsItem.h
@@ -17,8 +17,8 @@
 #include <array>
 #include <iterator>
 #include <optional>
+#include <span>
 #include <string>
-#include <vector>
 
 struct CoordsXYZ;
 class Formatter;
@@ -64,13 +64,13 @@ namespace OpenRCT2::News
      */
     struct Item
     {
-        News::ItemType Type;
-        uint8_t Flags;
-        uint32_t Assoc;
-        uint16_t Ticks;
-        uint16_t MonthYear;
-        uint8_t Day;
-        std::string Text;
+        News::ItemType Type = News::ItemType::Null;
+        uint8_t Flags{};
+        uint32_t Assoc{};
+        uint16_t Ticks{};
+        uint16_t MonthYear{};
+        uint8_t Day{};
+        std::string Text{};
 
         constexpr bool IsEmpty() const noexcept
         {
@@ -241,10 +241,7 @@ namespace OpenRCT2::News
 
         void clear() noexcept
         {
-            for (size_t i = 0; i < N; i++)
-            {
-                Queue[i].Type = News::ItemType::Null;
-            }
+            std::fill(Queue.begin(), Queue.end(), News::Item{});
         }
 
     private:
@@ -326,5 +323,5 @@ namespace OpenRCT2::News
     void RemoveItem(int32_t index);
 
     void importNewsItems(
-        GameState_t& gameState, const std::vector<News::Item>& recent, const std::vector<News::Item>& archived);
+        GameState_t& gameState, const std::span<const News::Item> recent, const std::span<const News::Item> archived);
 } // namespace OpenRCT2::News