diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 4ad986f03b..0de33f3f4f 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -150,7 +150,7 @@ static void window_news_update(rct_window* w) j = w->news.var_480; w->news.var_480 = -1; - for (i = MAX_RECENT_NEWS_ITEMS; i < MAX_NEWS_ITEMS; i++) + for (i = NEWS_ITEM_HISTORY_START; i < MAX_NEWS_ITEMS; i++) { if (news_item_is_empty(i)) return; @@ -188,7 +188,7 @@ static void window_news_scrollgetsize(rct_window* w, int32_t scrollIndex, int32_ int32_t itemHeight = window_news_get_item_height(); *height = 0; - for (int32_t i = MAX_RECENT_NEWS_ITEMS; i < MAX_NEWS_ITEMS; i++) + for (int32_t i = NEWS_ITEM_HISTORY_START; i < MAX_NEWS_ITEMS; i++) { if (news_item_is_empty(i)) break; @@ -208,7 +208,7 @@ static void window_news_scrollmousedown(rct_window* w, int32_t scrollIndex, cons buttonIndex = 0; auto mutableScreenCoords = screenCoords; - for (i = MAX_RECENT_NEWS_ITEMS; i < MAX_NEWS_ITEMS; i++) + for (i = NEWS_ITEM_HISTORY_START; i < MAX_NEWS_ITEMS; i++) { if (news_item_is_empty(i)) break; @@ -238,7 +238,7 @@ static void window_news_scrollmousedown(rct_window* w, int32_t scrollIndex, cons if (buttonIndex != 0) { - w->news.var_480 = i - MAX_RECENT_NEWS_ITEMS; + w->news.var_480 = i - NEWS_ITEM_HISTORY_START; w->news.var_482 = buttonIndex; w->news.var_484 = 4; w->Invalidate(); @@ -266,7 +266,7 @@ static void window_news_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32 int32_t i, x, y, yy, press; y = 0; - for (i = MAX_RECENT_NEWS_ITEMS; i < MAX_NEWS_ITEMS; i++) + for (i = NEWS_ITEM_HISTORY_START; i < MAX_NEWS_ITEMS; i++) { NewsItem* const newsItem = news_item_get(i); if (news_item_is_empty(i)) @@ -301,7 +301,7 @@ static void window_news_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32 press = 0; if (w->news.var_480 != -1) { - const uint8_t idx = MAX_RECENT_NEWS_ITEMS + w->news.var_480; + const uint8_t idx = NEWS_ITEM_HISTORY_START + w->news.var_480; news_item_is_valid_idx(idx); if (i == idx && w->news.var_482 == 1) press = INSET_RECT_FLAG_BORDER_INSET; @@ -378,7 +378,7 @@ static void window_news_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32 press = 0; if (w->news.var_480 != -1) { - const uint8_t idx = MAX_RECENT_NEWS_ITEMS + w->news.var_480; + const uint8_t idx = NEWS_ITEM_HISTORY_START + w->news.var_480; news_item_is_valid_idx(idx); if (i == idx && w->news.var_482 == 2) press = 0x20; diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 97374b6ced..8acb9f319a 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -56,10 +56,10 @@ NewsItem* news_item_get(int32_t index) NewsItem& NewsItemQueue::operator[](size_t index) { - if (index < MAX_RECENT_NEWS_ITEMS) + if (index < NEWS_ITEM_HISTORY_START) return Recent[index]; else - return Old[index - MAX_RECENT_NEWS_ITEMS]; + return Old[index - NEWS_ITEM_HISTORY_START]; } NewsItem* NewsItemQueue::At(int32_t index) @@ -187,7 +187,7 @@ void NewsItemQueue::MoveCurrentToOld() // Dequeue the current news item, shift news up memmove(Recent, Recent + 1, sizeof(NewsItem) * (std::size(Recent) - 1)); - Recent[MAX_RECENT_NEWS_ITEMS - 1].Type = NEWS_ITEM_NULL; + Recent[NEWS_ITEM_HISTORY_START - 1].Type = NEWS_ITEM_NULL; // Invalidate current news item bar auto intent = Intent(INTENT_ACTION_INVALIDATE_TICKER_NEWS); diff --git a/src/openrct2/management/NewsItem.h b/src/openrct2/management/NewsItem.h index 3f9bb24dc0..5b3c16058f 100644 --- a/src/openrct2/management/NewsItem.h +++ b/src/openrct2/management/NewsItem.h @@ -59,9 +59,9 @@ struct NewsItem } }; -constexpr int32_t MAX_RECENT_NEWS_ITEMS = 11; +constexpr int32_t NEWS_ITEM_HISTORY_START = 11; constexpr int32_t MAX_OLD_NEWS_ITEMS = 50; -constexpr int32_t MAX_NEWS_ITEMS = MAX_RECENT_NEWS_ITEMS + MAX_OLD_NEWS_ITEMS; +constexpr int32_t MAX_NEWS_ITEMS = NEWS_ITEM_HISTORY_START + MAX_OLD_NEWS_ITEMS; extern const uint8_t news_type_properties[10]; @@ -116,7 +116,7 @@ private: int32_t RemoveTime() const; void AppendToOld(NewsItem& item); - NewsItem Recent[MAX_RECENT_NEWS_ITEMS]; + NewsItem Recent[NEWS_ITEM_HISTORY_START]; NewsItem Old[MAX_OLD_NEWS_ITEMS]; };