From b6d3868c9d5da3f1dbe2bc072eb0f569d066e6a3 Mon Sep 17 00:00:00 2001 From: hdpoliveira Date: Mon, 25 May 2020 12:00:55 -0300 Subject: [PATCH] Rename FirstOpenSlot to FirstOpenOrCreateSlot --- src/openrct2/management/NewsItem.cpp | 6 +++--- src/openrct2/management/NewsItem.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 570a1f24e6..c481905bd3 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -329,7 +329,7 @@ std::optional 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; diff --git a/src/openrct2/management/NewsItem.h b/src/openrct2/management/NewsItem.h index f6f545ac2e..ea3a56d1f4 100644 --- a/src/openrct2/management/NewsItem.h +++ b/src/openrct2/management/NewsItem.h @@ -78,7 +78,7 @@ struct NewsItemQueue const NewsItem& Oldest() const; bool IsCurrentOld() const; void MoveCurrentToOld(); - NewsItem* FirstOpenSlot(); + NewsItem* FirstOpenOrCreateSlot(); template void ForeachRecentNews(Predicate&& p) {