mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity

Encapsulate gNewsItems

Browse Source
This commit is contained in:
hdpoliveira
2020-05-10 17:10:28 -03:00
parent 8f77125cdb
commit a4d010415b
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/management/NewsItem.cpp
View File

@@ -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[] = {

2
src/openrct2/management/NewsItem.h
View File

@@ -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();

2
src/openrct2/rct1/S4Importer.cpp
View File

@@ -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;

2
src/openrct2/rct2/S6Exporter.cpp
View File

@@ -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;

2
src/openrct2/rct2/S6Importer.cpp
View File

@@ -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;