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

Rename FirstOpenSlot to FirstOpenOrCreateSlot

Browse Source
This commit is contained in:
hdpoliveira
2020-05-25 12:00:55 -03:00
parent 4f698387f6
commit b6d3868c9d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,7 +329,7 @@ std::optional<CoordsXYZ> news_item_get_subject_location(int32_t type, int32_t su
return subjectLoc;
}
NewsItem* NewsItemQueue::FirstOpenSlot()
NewsItem* NewsItemQueue::FirstOpenOrCreateSlot()
{
auto it = std::begin(Recent);
for (; !it->IsEmpty();)
@@ -358,7 +358,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.FirstOpenSlot();
NewsItem* newsItem = gNewsItems.FirstOpenOrCreateSlot();
newsItem->Type = type;
newsItem->Flags = 0;
newsItem->Assoc = assoc;
@@ -494,7 +494,7 @@ void news_item_disable_news(uint8_t type, uint32_t assoc)
void news_item_add_to_queue_custom(NewsItem* newNewsItem)
{
NewsItem* newsItem = gNewsItems.FirstOpenSlot();
NewsItem* newsItem = gNewsItems.FirstOpenOrCreateSlot();
*newsItem = *newNewsItem;
newsItem++;
newsItem->Type = NEWS_ITEM_NULL;

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

@@ -78,7 +78,7 @@ struct NewsItemQueue
const NewsItem& Oldest() const;
bool IsCurrentOld() const;
void MoveCurrentToOld();
NewsItem* FirstOpenSlot();
NewsItem* FirstOpenOrCreateSlot();
template<typename Predicate> void ForeachRecentNews(Predicate&& p)
{