mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Extract function news_item_first_open_queue_slot (#11594)

This commit is contained in:
hdpoliveira 2020-05-10 18:19:56 -03:00 committed by GitHub
parent 142b229bfa
commit 46d856a723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,6 +295,20 @@ std::optional<CoordsXYZ> news_item_get_subject_location(int32_t type, int32_t su
return subjectLoc;
}
static NewsItem* news_item_first_open_queue_slot()
{
NewsItem* newsItem = gNewsItems;
while (newsItem->Type != NEWS_ITEM_NULL)
{
if (newsItem + 1 >= &gNewsItems[10])
news_item_close_current();
else
newsItem++;
}
return newsItem;
}
/**
*
* rct2: 0x0066DF55
@ -311,18 +325,7 @@ NewsItem* news_item_add_to_queue(uint8_t type, rct_string_id string_id, uint32_t
NewsItem* news_item_add_to_queue_raw(uint8_t type, const utf8* text, uint32_t assoc)
{
NewsItem* newsItem = gNewsItems;
// Find first open slot
while (newsItem->Type != NEWS_ITEM_NULL)
{
if (newsItem + 1 >= &gNewsItems[10])
news_item_close_current();
else
newsItem++;
}
// Now we have found an item slot to place the new news in
NewsItem* newsItem = news_item_first_open_queue_slot();
newsItem->Type = type;
newsItem->Flags = 0;
newsItem->Assoc = assoc;
@ -476,17 +479,7 @@ void news_item_disable_news(uint8_t type, uint32_t assoc)
void news_item_add_to_queue_custom(NewsItem* newNewsItem)
{
NewsItem* newsItem = gNewsItems;
// Find first open slot
while (newsItem->Type != NEWS_ITEM_NULL)
{
if (newsItem + 1 >= &gNewsItems[10])
news_item_close_current();
else
newsItem++;
}
NewsItem* newsItem = news_item_first_open_queue_slot();
*newsItem = *newNewsItem;
newsItem++;
newsItem->Type = NEWS_ITEM_NULL;