From a4d010415b047fe867e1840a0da328bd68213afb Mon Sep 17 00:00:00 2001
From: hdpoliveira <hdpoliveira@gmail.com>
Date: Sun, 10 May 2020 17:10:28 -0300
Subject: [PATCH] Encapsulate gNewsItems

---
 src/openrct2/management/NewsItem.cpp | 2 +-
 src/openrct2/management/NewsItem.h   | 2 --
 src/openrct2/rct1/S4Importer.cpp     | 2 +-
 src/openrct2/rct2/S6Exporter.cpp     | 2 +-
 src/openrct2/rct2/S6Importer.cpp     | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp
index 17ad8d09e6..ee2efddf90 100644
--- a/src/openrct2/management/NewsItem.cpp
+++ b/src/openrct2/management/NewsItem.cpp
@@ -23,7 +23,7 @@
 #include "../windows/Intent.h"
 #include "../world/Sprite.h"
 
-NewsItem gNewsItems[MAX_NEWS_ITEMS];
+static NewsItem gNewsItems[MAX_NEWS_ITEMS];
 
 /** rct2: 0x0097BE7C */
 const uint8_t news_type_properties[] = {
diff --git a/src/openrct2/management/NewsItem.h b/src/openrct2/management/NewsItem.h
index c1acfa40d2..afb51c040a 100644
--- a/src/openrct2/management/NewsItem.h
+++ b/src/openrct2/management/NewsItem.h
@@ -59,8 +59,6 @@ constexpr int32_t MAX_NEWS_ITEMS = 61;
 
 extern const uint8_t news_type_properties[10];
 
-extern NewsItem gNewsItems[MAX_NEWS_ITEMS];
-
 void news_item_init_queue();
 
 void news_item_update_current();
diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
index ba7dd3b95e..bfc80418b5 100644
--- a/src/openrct2/rct1/S4Importer.cpp
+++ b/src/openrct2/rct1/S4Importer.cpp
@@ -2531,7 +2531,7 @@ private:
         for (size_t i = 0; i < RCT12_MAX_NEWS_ITEMS; i++)
         {
             const rct12_news_item* src = &_s4.messages[i];
-            NewsItem* dst = &gNewsItems[i];
+            NewsItem* dst = news_item_get(static_cast<int32_t>(i));
 
             dst->Type = src->Type;
             dst->Flags = src->Flags;
diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp
index 0479a8a152..ebb676e20e 100644
--- a/src/openrct2/rct2/S6Exporter.cpp
+++ b/src/openrct2/rct2/S6Exporter.cpp
@@ -399,7 +399,7 @@ void S6Exporter::Export()
     // News items
     for (size_t i = 0; i < RCT12_MAX_NEWS_ITEMS; i++)
     {
-        const NewsItem* src = &gNewsItems[i];
+        const NewsItem* src = news_item_get(static_cast<int32_t>(i));
         rct12_news_item* dst = &_s6.news_items[i];
 
         dst->Type = src->Type;
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index eed88c0408..0f604d1d97 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -419,7 +419,7 @@ public:
         for (size_t i = 0; i < RCT12_MAX_NEWS_ITEMS; i++)
         {
             const rct12_news_item* src = &_s6.news_items[i];
-            NewsItem* dst = &gNewsItems[i];
+            NewsItem* dst = news_item_get(static_cast<int32_t>(i));
             if (src->Type < std::size(news_type_properties))
             {
                 dst->Type = src->Type;